Changeset 34925 in osm for applications/editors

Timestamp:

2019-03-20T20:27:12+01:00 (6 years ago)

Author:

donvip

Message:

fix #josm16568 - Turn lanes UI not working properly in smaller roads/lanes and junctions (patch by abhilekhsingh041992)

Location:

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui

Files:

• GuiContainer.java (modified) (1 diff)
• JunctionGui.java (modified) (1 diff)
• JunctionPane.java (modified) (1 diff)

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java

@@ -62 +62 @@
         this.mc = mc;
         this.translation = new Point2D.Double(-origin.getX(), -origin.getY());
-        this.mpp = 0.2;
+        this.mpp = 0.5;
         this.scale = mpsu / mpp;
-        this.laneWidth = 2 / mpp;
-
-        this.connectionStroke = new BasicStroke((float) (laneWidth / 4), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
+
+        this.laneWidth = 1.0 / mpp;
+
+        this.connectionStroke = new BasicStroke((float) (laneWidth / 5), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
 
         for (Junction j : mc.getPrimaryJunctions()) {

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionGui.java

@@ -387 +387 @@
         final double a = wide ? max(0, delta - (PI + 2 * MAX_ANGLE)) : delta;
 
-        final double cpf1 = cpf(a, container.getLaneWidth() / 2 + (wide ? right.roadGui.getWidth(right.roadEnd) : 0));
-        final double cpf2 = cpf(a, container.getLaneWidth() / 2 + (wide ? left.roadGui.getWidth(left.roadEnd) : 0));
+        final double cpf1 = cpf(a, container.getLaneWidth() / 5 + (wide ? right.roadGui.getWidth(right.roadEnd) : 0));
+        final double cpf2 = cpf(a, container.getLaneWidth() / 5 + (wide ? left.roadGui.getWidth(left.roadEnd) : 0));
 
         final Point2D c1 = relativePoint(rightCurb.getP1(), cpf1, right.angle + PI);

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java

@@ -454 +454 @@
         for (JunctionGui j : container.getJunctions()) {
             addAllInteractives(j.paint(g2d));
-            dot(g2d, new Point2D.Double(j.x, j.y), container.getLaneWidth() / 5);
+            dot(g2d, new Point2D.Double(j.x, j.y), container.getLaneWidth() / 10);
         }
     }