Changeset 16992 in josm


Ignore:
Timestamp:
2020-08-31T13:46:48+02:00 (2 months 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:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r16944 r16992  
    10221022            </optional>
    10231023            <reference ref="link_road_access_restrictions" />
     1024            <preset_link preset_name="Circular junction" text="Similar but different tags:" />
     1025            <preset_link preset_name="Mini-Roundabout" text="Similar but different tags:" />
    10241026        </item> <!-- Roundabout -->
     1027        <item name="Circular junction" icon="presets/vehicle/restriction/junction_circular.svg" type="way,closedway" preset_name_label="true">
     1028            <link wiki="Tag:junction=circular" />
     1029            <space />
     1030            <key key="junction" value="circular" />
     1031            <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" />
     1032            <optional>
     1033                <reference ref="name_layer" />
     1034                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
     1035                <reference ref="highway_yesno" />
     1036                <check key="oneway" text="Oneway" />
     1037                <text key="width" text="Width (meters)" />
     1038            </optional>
     1039            <reference ref="link_road_access_restrictions" />
     1040            <preset_link preset_name="Roundabout" text="Similar but different tags:" />
     1041            <preset_link preset_name="Mini-Roundabout" text="Similar but different tags:" />
     1042        </item> <!-- Circular junction -->
    10251043        <item name="Ford" icon="presets/vehicle/ford.svg" type="node,way" preset_name_label="true">
    10261044            <link wiki="Tag:ford=yes" />
     
    13031321            <space />
    13041322            <combo key="direction" text="Direction" values="clockwise" />
     1323            <preset_link preset_name="Roundabout" text="Similar but different tags:" />
     1324            <preset_link preset_name="Circular junction" text="Similar but different tags:" />
    13051325        </item> <!-- Mini-Roundabout -->
    13061326        <item name="Pedestrian Crossing" icon="presets/vehicle/crossing.svg" type="node" preset_name_label="true">
  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r16913 r16992  
    7575                "waterway=stream | waterway=river | waterway=ditch | waterway=drain | waterway=tidal_channel | "+
    7676                "(\"piste:type\"=downhill & -area=yes) | (\"piste:type\"=sled & -area=yes) | (man_made=\"piste:halfpipe\" & -area=yes) | "+
    77                 "junction=circular | junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
     77                "(junction=circular & -oneway=no) | junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
    7878                "(highway=motorway_link & -oneway=no & -oneway=reversible)";
    7979
Note: See TracChangeset for help on using the changeset viewer.