Changeset 5250 in josm for trunk

Timestamp:

2012-05-28T12:47:29+02:00 (13 years ago)

Author:

simon04

Message:

fix #7722 - update roundabout-related styles/presets/checks.

• allow junction=roundabout on nodes + icon
• require highway only for junctions on ways (validator)
• remove area style for highway=turning_circle

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/tagchecker.cfg (modified) (1 diff)
• styles/standard/elemstyles.xml (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -572 +572 @@
         </item>
         <separator/>
-        <item name="Roundabout" icon="presets/roundabout.png" type="closedway">
+        <item name="Roundabout" icon="presets/roundabout.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"

trunk/data/tagchecker.cfg

@@ -89 +89 @@
 # Taginfo query: select keypairs.key1, keypairs.key2, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key1='waterway' and keys.key=keypairs.key2 and (key1<>'highway' or keypairs.count_all>12000) and (key1<>'railway' or keypairs.count_all>3000) and (key1<>'waterway' or keypairs.count_all>800) and key2 not like '%:%' and from_fraction_all>0.97 and 1 union select keypairs.key2, keypairs.key1, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key2='waterway' and keys.key=keypairs.key1 and (key2<>'highway' or keypairs.count_all>12000) and (key2<>'railway' or keypairs.count_all>3000) and (key2<>'waterway' or keypairs.count_all>800) and key1 not like '%:%' and from_fraction_all>0.97 and 1 order by keypairs.count_all desc limit 1000;
 *    : W : incline              == * && highway != *                                   # incline without highway
-*    : W : junction             == * && highway != *                                   # junction without highway
+way  : W : junction             == * && highway != *                                   # junction without highway
 *    : W : lanes                == * && highway != *                                   # lanes without highway
 *    : W : lcn                  == * && highway != *                                   # lcn without highway

trunk/styles/standard/elemstyles.xml

@@ -692 +692 @@
         <rule>
                 <condition k="highway" v="turning_circle"/>
-                <area colour="turningcircle#c0c0c0"/>
                 <icon annotate="true" src="vehicle/turning_circle.png"/>
         </rule>
@@ -740 +739 @@
                 <condition k="junction" v="roundabout"/>
                 <line width="2" colour="roundabout#eeeeee"/>
-                <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
-                <icon annotate="true" src="misc/deprecated.png"/>
+                <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
         </rule>