Changeset 9358 in josm for trunk/src/org

Timestamp:

2016-01-09T19:47:49+01:00 (8 years ago)

Author:

simon04

Message:

fix #12309 - Improve Way Accuracy: draw helper lines to intersecting way

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -82 +82 @@
     private transient Stroke selectTargetWayStroke;
     private transient Stroke moveNodeStroke;
+    private transient Stroke moveNodeIntersectingStroke;
     private transient Stroke addNodeStroke;
     private transient Stroke deleteNodeStroke;
@@ -147 +148 @@
         selectTargetWayStroke = GuiHelper.getCustomizedStroke(Main.pref.get("improvewayaccuracy.stroke.select-target", "2"));
         moveNodeStroke = GuiHelper.getCustomizedStroke(Main.pref.get("improvewayaccuracy.stroke.move-node", "1 6"));
+        moveNodeIntersectingStroke = GuiHelper.getCustomizedStroke(Main.pref.get("improvewayaccuracy.stroke.move-node-intersecting", "1 2 6"));
         addNodeStroke = GuiHelper.getCustomizedStroke(Main.pref.get("improvewayaccuracy.stroke.add-node", "1"));
         deleteNodeStroke = GuiHelper.getCustomizedStroke(Main.pref.get("improvewayaccuracy.stroke.delete-node", "1"));
@@ -308 +310 @@
             }
 
+            if (!alt && !ctrl && candidateNode != null) {
+                b.reset();
+                drawIntersectingWayHelperLines(mv, b);
+                g.setStroke(moveNodeIntersectingStroke);
+                g.draw(b);
+            }
+
+        }
+    }
+
+    protected void drawIntersectingWayHelperLines(MapView mv, GeneralPath b) {
+        for (final OsmPrimitive referrer : candidateNode.getReferrers()) {
+            if (!(referrer instanceof Way) || targetWay.equals(referrer)) {
+                continue;
+            }
+            final List<Node> nodes = ((Way) referrer).getNodes();
+            for (int i = 0; i < nodes.size(); i++) {
+                if (!candidateNode.equals(nodes.get(i))) {
+                    continue;
+                }
+                if (i > 0) {
+                    final Point p = mv.getPoint(nodes.get(i - 1));
+                    b.moveTo(mousePos.x, mousePos.y);
+                    b.lineTo(p.x, p.y);
+                }
+                if (i < nodes.size() - 1) {
+                    final Point p = mv.getPoint(nodes.get(i + 1));
+                    b.moveTo(mousePos.x, mousePos.y);
+                    b.lineTo(p.x, p.y);
+                }
+            }
         }
     }