From 451950bba9ee3b25b5d0c6e5f0b55f08a5b29f73 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 14 Jun 2014 14:33:58 -0700 Subject: [PATCH] altoslib: Add units converters for latitude and longitude Makes display of these values consistent across all instances Signed-off-by: Keith Packard --- altoslib/AltosConvert.java | 4 +++ altoslib/AltosLatitude.java | 23 +++++++++++++ altoslib/AltosLocation.java | 66 ++++++++++++++++++++++++++++++++++++ altoslib/AltosLongitude.java | 23 +++++++++++++ altoslib/Makefile.am | 3 ++ 5 files changed, 119 insertions(+) create mode 100644 altoslib/AltosLatitude.java create mode 100644 altoslib/AltosLocation.java create mode 100644 altoslib/AltosLongitude.java diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java index 87b9eaf2..dc0fbb62 100644 --- a/altoslib/AltosConvert.java +++ b/altoslib/AltosConvert.java @@ -351,6 +351,10 @@ public class AltosConvert { public static AltosVoltage voltage = new AltosVoltage(); + public static AltosLatitude latitude = new AltosLatitude(); + + public static AltosLongitude longitude = new AltosLongitude(); + public static String show_gs(String format, double a) { a = meters_to_g(a); format = format.concat(" g"); diff --git a/altoslib/AltosLatitude.java b/altoslib/AltosLatitude.java new file mode 100644 index 00000000..6156d6dc --- /dev/null +++ b/altoslib/AltosLatitude.java @@ -0,0 +1,23 @@ +/* + * Copyright © 2014 Keith Packard + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +package org.altusmetrum.altoslib_4; + +public class AltosLatitude extends AltosLocation { + public String pos() { return "N"; } + public String neg() { return "S"; } +} diff --git a/altoslib/AltosLocation.java b/altoslib/AltosLocation.java new file mode 100644 index 00000000..725a02ba --- /dev/null +++ b/altoslib/AltosLocation.java @@ -0,0 +1,66 @@ +/* + * Copyright © 2014 Keith Packard + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +package org.altusmetrum.altoslib_4; + +public abstract class AltosLocation extends AltosUnits { + + public abstract String pos(); + public abstract String neg(); + + public double value(double v, boolean imperial_units) { + return v; + } + + public double inverse(double v, boolean imperial_units) { + return v; + } + + public String show_units(boolean imperial_units) { + return "°"; + } + + public String say_units(boolean imperial_units) { + return "degrees"; + } + + public int show_fraction(int width, boolean imperial_units) { + return 2; + } + + public String show(int width, double v, boolean imperial_units) { + String h = pos(); + if (v < 0) { + h = neg(); + v = -v; + } + int deg = (int) Math.floor(v); + double min = (v - Math.floor(v)) * 60.0; + return String.format("%s %4d° %9.6f", h, deg, min); + } + + public String say(double v, boolean imperial_units) { + String h = pos(); + if (v < 0) { + h = neg(); + v = -v; + } + int deg = (int) Math.floor(v); + double min = (v - Math.floor(v)) * 60.0; + return String.format("%s %d degrees %d", h, deg, (int) Math.floor(min + 0.5)); + } +} diff --git a/altoslib/AltosLongitude.java b/altoslib/AltosLongitude.java new file mode 100644 index 00000000..29a5dcd4 --- /dev/null +++ b/altoslib/AltosLongitude.java @@ -0,0 +1,23 @@ +/* + * Copyright © 2014 Keith Packard + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +package org.altusmetrum.altoslib_4; + +public class AltosLongitude extends AltosLocation { + public String pos() { return "E"; } + public String neg() { return "W"; } +} diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am index bd47f89f..e81418bb 100644 --- a/altoslib/Makefile.am +++ b/altoslib/Makefile.am @@ -120,6 +120,9 @@ altoslib_JAVA = \ AltosTemperature.java \ AltosAccel.java \ AltosVoltage.java \ + AltosLocation.java \ + AltosLatitude.java \ + AltosLongitude.java \ AltosPyro.java \ AltosWriter.java -- 2.30.2