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

Timestamp:

2019-09-19T16:37:15+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18047 - consider junction=circular like junction=roundabout

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/validation/tests/Highways.java (modified) (2 diffs)
• gui/dialogs/relation/sort/RelationSortUtils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -74 +74 @@
                 "waterway=stream | waterway=river | waterway=ditch | waterway=drain | "+
                 "(\"piste:type\"=downhill & -area=yes) | (\"piste:type\"=sled & -area=yes) | (man_made=\"piste:halfpipe\" & -area=yes) | "+
-                "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
+                "junction=circular | junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
                 "(highway=motorway_link & -oneway=no & -oneway=reversible)";
 

trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java

@@ -97 +97 @@
     public void visit(Way w) {
         if (w.isUsable()) {
-            if (w.isClosed() && w.hasTag(HIGHWAY, CLASSIFIED_HIGHWAYS) && w.hasTag("junction", "roundabout")
+            if (w.isClosed() && w.hasTag(HIGHWAY, CLASSIFIED_HIGHWAYS) && w.hasTag("junction", "circular", "roundabout")
                     && IN_DOWNLOADED_AREA_STRICT.test(w)) {
                 // TODO: find out how to handle splitted roundabouts (see #12841)
@@ -191 +191 @@
             // But if we have more than a single adjacent class, and one of them is a roundabout, that's an error
             for (Way w : sameClass) {
-                if (w.hasTag("junction", "roundabout")) {
+                if (w.hasTag("junction", "circular", "roundabout")) {
                     return false;
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java

@@ -32 +32 @@
 
     static Direction roundaboutType(Way w) {
-        if (w != null && w.hasTag("junction", "roundabout")) {
+        if (w != null && w.hasTag("junction", "circular", "roundabout")) {
             int nodesCount = w.getNodesCount();
             if (nodesCount > 2 && nodesCount < 200) {