Changeset 11133 in josm

Timestamp:

2016-10-16T19:32:18+02:00 (9 years ago)

Author:

Klumbumbus

Message:

different small adjustments: allow leisure=horse_riding as physical feature for sport=*; print the key with the uncommon character; leisure=slipway node should be connected to a way; update lanes preset and ignore list

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (4 diffs)
• validator/combinations.mapcss (modified) (1 diff)
• validator/deprecated.mapcss (modified) (1 diff)
• validator/geometry.mapcss (modified) (1 diff)
• validator/ignoretags.cfg (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -35 +35 @@
     <chunk id="highway_base">
         <space />
-        <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+        <combo key="lanes" text="Lanes" values="1,2,3,4,5,6" length="3" />
         <combo key="lanes:forward" text="Lanes in way direction" values="1,2,3,4,5" length="3" />
         <combo key="lanes:backward" text="Lanes opposed to way direction" values="1,2,3,4,5" length="3" />
@@ -714 +714 @@
             <text key="maxspeed" text="Max. speed (km/h)" default="30" />
             <optional>
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
                 <reference ref="surface_smoothness" />
@@ -739 +739 @@
             <text key="name" text="Name" />
             <optional>
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <reference ref="surface_smoothness" />
@@ -949 +949 @@
             <optional>
                 <reference ref="name_layer" />
-                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
                 <reference ref="highway_yesno_incline_oneway" />
                 <text key="width" text="Width (meters)" />

trunk/data/validator/combinations.mapcss

@@ -305 +305 @@
 
 /* #9593, #11183, #12418, #12761 */
-*[sport][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
+*[sport][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink|horse_riding)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
     throwWarning: tr("sport without physical feature");
     assertMatch: "node sport=tennis";

trunk/data/validator/deprecated.mapcss

@@ -526 +526 @@
 /* see #11234 */
 *[/=|\+|\/|&|<|>|;|'|"|%|#|@|\\|,|\.|\{|\}|\?|\*|\^|\$/] {
-  throwWarning: tr("key with uncommon character");
+  throwWarning: tr("{0}", "{0.key}");
+  group: tr("key with uncommon character");
 }
 

trunk/data/validator/geometry.mapcss

@@ -195 +195 @@
 node:unconnected:in-downloaded-area[waterway=waterfall],
 node:unconnected:in-downloaded-area[amenity=ferry_terminal],
+node:unconnected:in-downloaded-area[leisure=slipway],
 node:unconnected:in-downloaded-area[mountain_pass=yes],
 node:unconnected:in-downloaded-area[barrier=gate],

trunk/data/validator/ignoretags.cfg

@@ -170 +170 @@
 K:hazmat:water=no
 K:hazmat:water=permissive
+K:lanes=7
+K:lanes=8
+K:lanes=9
+K:oneway=-1
 ;
 ; Amenity Key/Value Pairs