Ticket #2801: junction_nodes.patch

src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

@@ -16 +16 @@
     public String code;
     Collection<Rule> rules = null;
 
+    public enum NodeBorderStyle {
+        NONE, SQUARE, TRIANGLE
+    }
+
     @Override
     public boolean equals(Object o) {
         return (o instanceof ElemStyle) && (((ElemStyle) o).getCode().equals(getCode()));

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

@@ -20 +20 @@
             boolean selected) {
         Node n = (Node)primitive;
         String name = painter.isShowNames()?painter.getNodeName(n):null;
+        NodeBorderStyle border = NodeBorderStyle.NONE;
+        if (n.isConnection()) {
+            border = NodeBorderStyle.SQUARE;
+        }
         if (n.isHighlighted()) {
-            painter.drawNode(n, settings.getHighlightColor(), settings.getSelectedNodeSize(), settings.isFillSelectedNode(), name);
+            painter.drawNode(n, settings.getHighlightColor(), settings.getSelectedNodeSize(), settings.isFillSelectedNode(), name, border);
         } else if (selected) {
-            painter.drawNode(n, settings.getSelectedColor(), settings.getSelectedNodeSize(), settings.isFillSelectedNode(), name);
+            painter.drawNode(n, settings.getSelectedColor(), settings.getSelectedNodeSize(), settings.isFillSelectedNode(), name, border);
         } else if (n.isTagged()) {
-            painter.drawNode(n, settings.getNodeColor(), settings.getTaggedNodeSize(), settings.isFillUnselectedNode(), name);
+            painter.drawNode(n, settings.getNodeColor(), settings.getTaggedNodeSize(), settings.isFillUnselectedNode(), name, border);
         } else if (painter.isInactive() || n.isDisabled()) {
-            painter.drawNode(n, settings.getInactiveColor(), settings.getUnselectedNodeSize(), settings.isFillUnselectedNode(), name);
+            painter.drawNode(n, settings.getInactiveColor(), settings.getUnselectedNodeSize(), settings.isFillUnselectedNode(), name, border);
         } else {
-            painter.drawNode(n, settings.getNodeColor(), settings.getUnselectedNodeSize(), settings.isFillUnselectedNode(), name);
+            painter.drawNode(n, settings.getNodeColor(), settings.getUnselectedNodeSize(), settings.isFillUnselectedNode(), name, border);
         }
     }
 

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

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

src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.mappaint.ElemStyle.NodeBorderStyle;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.LanguageInfo;
 
@@ -210 +211 @@
      * @param color The color of the node.
      */
     public void drawNode(Node n, Color color, int size, boolean fill, String name) {
+        drawNode(n, color, size, fill, name, NodeBorderStyle.NONE);
+    }
+
+    public void drawNode(Node n, Color color, int size, boolean fill, String name, NodeBorderStyle border) {
         if (size > 1) {
             int radius = size / 2;
             Point p = nc.getPoint(n);
@@ -229 +234 @@
                 g.drawRect(p.x - radius, p.y - radius, size, size);
             }
 
+            if (border == NodeBorderStyle.SQUARE) {
+                g.drawRect(p.x - 2*radius, p.y - 2*radius, 2*size, 2*size);
+            }
+
             if(name != null)            {
                 if (inactive || n.isDisabled()) {
                     g.setColor(inactiveColor);