Changeset 13142 in josm for trunk/src

Timestamp:

2017-11-22T01:49:53+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14082 - Remove coordinates from nodes in validator and selection dialogs by default (new option like objects ids to display them)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DefaultNameFormatter.java (modified) (1 diff)
• gui/preferences/display/LafPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java

@@ -186 +186 @@
                 preset.nameTemplate.appendText(name, node);
             }
-            if (node.getCoor() != null) {
-                name.append(" \u200E(").append(CoordinateFormatManager.getDefaultFormat().latToString(node)).append(", ")
+            if (node.isLatLonKnown() && Config.getPref().getBoolean("osm-primitives.showcoor")) {
+                name.append(" \u200E(")
+                    .append(CoordinateFormatManager.getDefaultFormat().latToString(node)).append(", ")
                     .append(CoordinateFormatManager.getDefaultFormat().lonToString(node)).append(')');
             }
         }
         decorateNameWithId(name, node);
-
 
         String result = name.toString();

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -82 +82 @@
     private final JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup"));
     private final JCheckBox showID = new JCheckBox(tr("Show object ID in selection lists"));
+    private final JCheckBox showCoor = new JCheckBox(tr("Show node coordinates in selection lists"));
     private final JCheckBox showLocalizedName = new JCheckBox(tr("Show localized name in selection lists"));
     private final JCheckBox modeless = new JCheckBox(tr("Modeless working (Potlatch style)"));
@@ -132 +133 @@
         showID.setSelected(Config.getPref().getBoolean("osm-primitives.showid", false));
 
+        // Show Coordinates in selection
+        showCoor.setToolTipText(tr("Show node coordinates in selection lists"));
+        showCoor.setSelected(Config.getPref().getBoolean("osm-primitives.showcoor", false));
+
         // Show localized names
         showLocalizedName.setToolTipText(tr("Show localized name in selection lists, if available"));
@@ -142 +147 @@
 
         panel.add(showID, GBC.eop().insets(20, 0, 0, 0));
+        panel.add(showCoor, GBC.eop().insets(20, 0, 0, 0));
         panel.add(showLocalizedName, GBC.eop().insets(20, 0, 0, 0));
         panel.add(modeless, GBC.eop().insets(20, 0, 0, 0));
@@ -205 +211 @@
         Config.getPref().putBoolean("draw.splashscreen", showSplashScreen.isSelected());
         Config.getPref().putBoolean("osm-primitives.showid", showID.isSelected());
+        Config.getPref().putBoolean("osm-primitives.showcoor", showCoor.isSelected());
         Config.getPref().putBoolean("osm-primitives.localize-name", showLocalizedName.isSelected());
         MapFrame.MODELESS.put(modeless.isSelected());