Changeset 36117 in osm for applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java

Timestamp:

2023-08-15T15:55:08+02:00 (17 months ago)

Author:

stoecker

Message:

move all preferences to prefs class, allow to show distance to way, make nearest way independent from current display

File:

• applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java (modified) (6 diffs)

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
 import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.ProjectedCoordinateFormat;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -34 +35 @@
     private JLabel nmeaStatusLabel;
     private JLabel wayLabel;
+    private JLabel latText;
     private JLabel latLabel;
+    private JLabel longText;
     private JLabel longLabel;
     private JLabel courseLabel;
@@ -55 +58 @@
         panel.add(new JLabel(tr("Way Info")));
         panel.add(wayLabel = new JLabel());
-        panel.add(new JLabel(tr("Latitude")));
+        panel.add(latText = new JLabel(tr("Latitude")));
         panel.add(latLabel = new JLabel());
-        panel.add(new JLabel(tr("Longitude")));
+        panel.add(longText = new JLabel(tr("Longitude")));
         panel.add(longLabel = new JLabel());
         panel.add(new JLabel(tr("Speed")));
@@ -72 +75 @@
      */
     private void setStatusVisibility(boolean init) {
-        boolean statusGPSDNew = !Config.getPref().getBoolean(LiveGpsAcquirer.C_DISABLED);
+        boolean statusGPSDNew = !Config.getPref().getBoolean(LiveGPSPreferences.C_DISABLED);
         if (init || statusGPSD != statusGPSDNew) {
             statusText.setVisible(statusGPSDNew);
@@ -78 +81 @@
             statusGPSD = statusGPSDNew;
         }
-        boolean statusNMEANew = !Config.getPref().get(LiveGpsAcquirerNMEA.C_SERIAL).isEmpty();
+        boolean statusNMEANew = !Config.getPref().get(LiveGPSPreferences.C_SERIAL).isEmpty();
         if (init || statusNMEA != statusNMEANew) {
             nmeaStatusText.setVisible(statusNMEANew);
@@ -100 +103 @@
                     panel.setBackground(Color.WHITE);
                     ICoordinateFormat mCord = CoordinateFormatManager.getDefaultFormat();
+                    if (ProjectedCoordinateFormat.INSTANCE.equals(mCord)) {
+                        latText.setText(tr("Northing"));
+                        longText.setText(tr("Easting"));
+                    } else {
+                        latText.setText(tr("Latitude"));
+                        longText.setText(tr("Longitude"));
+                    }
                     latLabel.setText(mCord.latToString(data.getLatLon()));
                     longLabel.setText(mCord.lonToString(data.getLatLon()));