Changeset 16992 in josm for trunk

Timestamp:

2020-08-31T13:46:48+02:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #19713 - Add junction=circular (icon self created, PD and CC0 licensed) and remove default oneway arrows in case of oneway=no; add preset links between roundabout, mini-roundabout and circular junction

Location:

trunk

Files:

• resources/data/defaultpresets.xml (modified) (2 diffs)
• resources/images/presets/vehicle/restriction/junction_circular.svg (added)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -1022 +1022 @@
             </optional>
             <reference ref="link_road_access_restrictions" />
+            <preset_link preset_name="Circular junction" text="Similar but different tags:" />
+            <preset_link preset_name="Mini-Roundabout" text="Similar but different tags:" />
         </item> <!-- Roundabout -->
+        <item name="Circular junction" icon="presets/vehicle/restriction/junction_circular.svg" type="way,closedway" preset_name_label="true">
+            <link wiki="Tag:junction=circular" />
+            <space />
+            <key key="junction" value="circular" />
+            <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" />
+            <optional>
+                <reference ref="name_layer" />
+                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
+                <reference ref="highway_yesno" />
+                <check key="oneway" text="Oneway" />
+                <text key="width" text="Width (meters)" />
+            </optional>
+            <reference ref="link_road_access_restrictions" />
+            <preset_link preset_name="Roundabout" text="Similar but different tags:" />
+            <preset_link preset_name="Mini-Roundabout" text="Similar but different tags:" />
+        </item> <!-- Circular junction -->
         <item name="Ford" icon="presets/vehicle/ford.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:ford=yes" />
@@ -1303 +1321 @@
             <space />
             <combo key="direction" text="Direction" values="clockwise" />
+            <preset_link preset_name="Roundabout" text="Similar but different tags:" />
+            <preset_link preset_name="Circular junction" text="Similar but different tags:" />
         </item> <!-- Mini-Roundabout -->
         <item name="Pedestrian Crossing" icon="presets/vehicle/crossing.svg" type="node" preset_name_label="true">

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

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