Changeset 11256 in josm for trunk/src

Timestamp:

2016-11-14T23:32:57+01:00 (8 years ago)

Author:

Don-vip

Message:

see #10387 - Gibraltar and British Indian Ocean Territory are the only British territories driving on right side

File:

• trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java

@@ -42 +42 @@
 public final class RightAndLefthandTraffic {
 
+    private static final String DRIVING_SIDE = "driving_side";
+    private static final String LEFT = "left";
+    private static final String RIGHT = "right";
+
     private static class RLTrafficGeoProperty implements GeoProperty<Boolean> {
 
@@ -109 +113 @@
         Collection<Way> allWays = data.getWays();
         for (Way w : allWays) {
-            if ("left".equals(w.get("driving_side"))) {
+            if (LEFT.equals(w.get(DRIVING_SIDE))) {
                 addWayIfNotInner(ways, w);
             }
         }
         for (Relation r : allRelations) {
-            if (r.isMultipolygon() && "left".equals(r.get("driving_side"))) {
+            if (r.isMultipolygon() && LEFT.equals(r.get(DRIVING_SIDE))) {
                 for (RelationMember rm : r.getMembers()) {
-                    if (rm.isWay() && "outer".equals(rm.getRole())) {
+                    if (rm.isWay() && "outer".equals(rm.getRole()) && !RIGHT.equals(rm.getMember().get(DRIVING_SIDE))) {
                         addWayIfNotInner(ways, (Way) rm.getMember());
                     }
@@ -167 +171 @@
         Set<Way> s = Collections.singleton(w);
         for (Relation r : OsmPrimitive.getParentRelations(s)) {
-            if (r.isMultipolygon() && "left".equals(r.get("driving_side")) &&
+            if (r.isMultipolygon() && LEFT.equals(r.get(DRIVING_SIDE)) &&
                 "inner".equals(r.getMembersFor(s).iterator().next().getRole())) {
                 if (Main.isDebugEnabled()) {