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

Timestamp:

2009-01-18T18:42:14+01:00 (16 years ago)

Author:

ulfl

Message:

add mappaint.lefthandtraffic option to distinguish if the turn restriction signs must be placed to the right (default) or to the left of the street (setting might be useful elsewhere ...)

fix a bug when the heading of the "from" way was exactly 0/180 degrees

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -46 +46 @@
     protected boolean drawMultipolygon;
     protected boolean drawRestriction;
+    protected boolean leftHandTraffic;
     protected boolean restrictionDebug;
     protected int showNames;
@@ -660 +661 @@
         double dy = (pFrom.y >= pVia.y) ? (pFrom.y - pVia.y) : (pVia.y - pFrom.y);
         
+        double fromAngle;
         if(dx == 0.0) {
-            System.out.println("dx " + dx);
-            return;
-        }
-        double fromAngle = Math.atan(dy / dx);
+            fromAngle = Math.PI/2;
+        } else {
+            fromAngle = Math.atan(dy / dx);
+        }
         double fromAngleDeg = Math.toDegrees(fromAngle);
 
@@ -684 +686 @@
 
         if(pFrom.x >= pVia.x && pFrom.y >= pVia.y) {
-            vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
-            vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
+            if(leftHandTraffic) {
+                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
+                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
+            } else {
+                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
+                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
+            }
             iconAngle = 270+fromAngleDeg;
         }
         if(pFrom.x < pVia.x && pFrom.y >= pVia.y) {
-            vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
-            vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
+            if(leftHandTraffic) {
+                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
+                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
+            } else {
+                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 180));
+                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 180));
+            }
             iconAngle = 90-fromAngleDeg;
         }
         if(pFrom.x < pVia.x && pFrom.y < pVia.y) {
-            vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
-            vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
+            if(leftHandTraffic) {
+                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
+                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
+            } else {
+                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
+                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
+            }
             iconAngle = 90+fromAngleDeg;
         }
         if(pFrom.x >= pVia.x && pFrom.y < pVia.y) {
-            vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg+180));
-            vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg+180));
+            if(leftHandTraffic) {
+                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 180));
+                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 180));
+             } else {
+                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
+                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
+            }
             iconAngle = 270-fromAngleDeg;
         }
@@ -1193 +1215 @@
         drawRestriction = Main.pref.getBoolean("mappaint.restriction",false);
         restrictionDebug = Main.pref.getBoolean("mappaint.restriction.debug",false);
+        leftHandTraffic = Main.pref.getBoolean("mappaint.lefthandtraffic",false);
         orderFont = new Font(Main.pref.get("mappaint.font","Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
         String currentLocale = Locale.getDefault().getLanguage();