| 1 | Index: src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java
|
|---|
| 2 | ===================================================================
|
|---|
| 3 | --- src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java (revision 34318)
|
|---|
| 4 | +++ src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java (working copy)
|
|---|
| 5 | @@ -61,12 +61,15 @@
|
|---|
| 6 |
|
|---|
| 7 | this.mc = mc;
|
|---|
| 8 | this.translation = new Point2D.Double(-origin.getX(), -origin.getY());
|
|---|
| 9 | - this.mpp = 0.2;
|
|---|
| 10 | + this.mpp = 0.5;
|
|---|
| 11 | this.scale = mpsu / mpp;
|
|---|
| 12 | - this.laneWidth = 2 / mpp;
|
|---|
| 13 |
|
|---|
| 14 | - this.connectionStroke = new BasicStroke((float) (laneWidth / 4), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
|
|---|
| 15 | + this.laneWidth = 1.0 / mpp;
|
|---|
| 16 |
|
|---|
| 17 | + this.connectionStroke = new BasicStroke((float) (laneWidth / 5), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
|
|---|
| 18 | +
|
|---|
| 19 | for (Junction j : mc.getPrimaryJunctions()) {
|
|---|
| 20 | getGui(j);
|
|---|
| 21 | }
|
|---|
| 22 | Index: src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionGui.java
|
|---|
| 23 | ===================================================================
|
|---|
| 24 | --- src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionGui.java (revision 34318)
|
|---|
| 25 | +++ src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionGui.java (working copy)
|
|---|
| 26 | @@ -386,8 +386,9 @@
|
|---|
| 27 | final boolean wide = delta > PI;
|
|---|
| 28 | final double a = wide ? max(0, delta - (PI + 2 * MAX_ANGLE)) : delta;
|
|---|
| 29 |
|
|---|
| 30 | - final double cpf1 = cpf(a, container.getLaneWidth() / 2 + (wide ? right.roadGui.getWidth(right.roadEnd) : 0));
|
|---|
| 31 | - final double cpf2 = cpf(a, container.getLaneWidth() / 2 + (wide ? left.roadGui.getWidth(left.roadEnd) : 0));
|
|---|
| 32 | + final double cpf1 = cpf(a, container.getLaneWidth() / 5 + (wide ? right.roadGui.getWidth(right.roadEnd) : 0));
|
|---|
| 33 | + final double cpf2 = cpf(a, container.getLaneWidth() / 5 + (wide ? left.roadGui.getWidth(left.roadEnd) : 0));
|
|---|
| 34 |
|
|---|
| 35 | final Point2D c1 = relativePoint(rightCurb.getP1(), cpf1, right.angle + PI);
|
|---|
| 36 | final Point2D c2 = relativePoint(leftCurb.getP1(), cpf2, left.angle + PI);
|
|---|
| 37 | Index: src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java
|
|---|
| 38 | ===================================================================
|
|---|
| 39 | --- src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java (revision 34318)
|
|---|
| 40 | +++ src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java (working copy)
|
|---|
| 41 | @@ -453,7 +453,8 @@
|
|---|
| 42 |
|
|---|
| 43 | for (JunctionGui j : container.getJunctions()) {
|
|---|
| 44 | addAllInteractives(j.paint(g2d));
|
|---|
| 45 | - dot(g2d, new Point2D.Double(j.x, j.y), container.getLaneWidth() / 5);
|
|---|
| 46 | + dot(g2d, new Point2D.Double(j.x, j.y), container.getLaneWidth() / 10);
|
|---|
| 47 | }
|
|---|
| 48 | }
|
|---|
