Changeset 3159 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-03-27T18:37:41+01:00 (14 years ago)

Author:

bastiK

Message:

fixed #2801 - Display junction nodes with a different style à la Potlatch

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Node.java (modified) (1 diff)
• data/osm/visitor/paint/MapPaintSettings.java (modified) (4 diffs)
• gui/mappaint/SimpleNodeElemStyle.java (modified) (1 diff)

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

@@ -196 +196 @@
         // Do nothing for now, but in future replace CachedLatLon with simple doubles and update precalculated EastNorth value here
     }
+
+    public boolean isJunctionNode() {
+        return (OsmPrimitive.getFilteredList(getReferrers(), Way.class)).size() > 1;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java

@@ -22 +22 @@
     private int showIconsDistance;
     private int selectedNodeSize;
-    private int taggedNodeSize;
+    private int junctionNodeSize;
     private int unselectedNodeSize;
     private boolean fillSelectedNode;
     private boolean fillUnselectedNode;
-
+    private boolean fillTaggedNode;
     private Color selectedColor;
     private Color highlightColor;
@@ -57 +57 @@
         selectedNodeSize = Main.pref.getInteger("mappaint.node.selected-size", 5);
         unselectedNodeSize = Main.pref.getInteger("mappaint.node.unselected-size", 3);
-        taggedNodeSize = Main.pref.getInteger("mappaint.node.tagged-size", 5);
+        junctionNodeSize = Main.pref.getInteger("mappaint.node.junction-size", 5);
         fillSelectedNode = Main.pref.getBoolean("mappaint.node.fill-selected", true);
         fillUnselectedNode = Main.pref.getBoolean("mappaint.node.fill-unselected", false);
+        fillTaggedNode = Main.pref.getBoolean("mappaint.node.fill-tagged", true);
     }
 
@@ -126 +127 @@
     }
 
-    public int getTaggedNodeSize() {
-        return taggedNodeSize;
+    public int getJunctionNodeSize() {
+        return junctionNodeSize;
     }
 
@@ -141 +142 @@
         return fillUnselectedNode;
     }
+
+    public boolean isFillTaggedNode() {
+        return fillTaggedNode;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/SimpleNodeElemStyle.java

@@ -25 +25 @@
         } else if (selected) {
             painter.drawNode(n, settings.getSelectedColor(), settings.getSelectedNodeSize(), settings.isFillSelectedNode(), name);
-        } else if (n.isTagged()) {
-            painter.drawNode(n, settings.getNodeColor(), settings.getTaggedNodeSize(), settings.isFillUnselectedNode(), name);
-        } else if (painter.isInactive() || n.isDisabled()) {
-            painter.drawNode(n, settings.getInactiveColor(), settings.getUnselectedNodeSize(), settings.isFillUnselectedNode(), name);
         } else {
-            painter.drawNode(n, settings.getNodeColor(), settings.getUnselectedNodeSize(), settings.isFillUnselectedNode(), name);
+            painter.drawNode(
+                n,
+                (painter.isInactive() || n.isDisabled()) ? settings.getInactiveColor() : settings.getNodeColor(),
+                n.isJunctionNode() ? settings.getJunctionNodeSize() : settings.getUnselectedNodeSize(),
+                n.isTagged() ? settings.isFillTaggedNode() : settings.isFillUnselectedNode(),
+                name);
         }
     }