Changeset 11133 in josm for trunk


Ignore:
Timestamp:
2016-10-16T19:32:18+02:00 (3 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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r11076 r11133  
    3535    <chunk id="highway_base">
    3636        <space />
    37         <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
     37        <combo key="lanes" text="Lanes" values="1,2,3,4,5,6" length="3" />
    3838        <combo key="lanes:forward" text="Lanes in way direction" values="1,2,3,4,5" length="3" />
    3939        <combo key="lanes:backward" text="Lanes opposed to way direction" values="1,2,3,4,5" length="3" />
     
    714714            <text key="maxspeed" text="Max. speed (km/h)" default="30" />
    715715            <optional>
    716                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
     716                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
    717717                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
    718718                <reference ref="surface_smoothness" />
     
    739739            <text key="name" text="Name" />
    740740            <optional>
    741                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
     741                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
    742742                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    743743                <reference ref="surface_smoothness" />
     
    949949            <optional>
    950950                <reference ref="name_layer" />
    951                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
     951                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
    952952                <reference ref="highway_yesno_incline_oneway" />
    953953                <text key="width" text="Width (meters)" />
  • trunk/data/validator/combinations.mapcss

    r11080 r11133  
    305305
    306306/* #9593, #11183, #12418, #12761 */
    307 *[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] {
     307*[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] {
    308308    throwWarning: tr("sport without physical feature");
    309309    assertMatch: "node sport=tennis";
  • trunk/data/validator/deprecated.mapcss

    r11049 r11133  
    526526/* see #11234 */
    527527*[/=|\+|\/|&|<|>|;|'|"|%|#|@|\\|,|\.|\{|\}|\?|\*|\^|\$/] {
    528   throwWarning: tr("key with uncommon character");
     528  throwWarning: tr("{0}", "{0.key}");
     529  group: tr("key with uncommon character");
    529530}
    530531
  • trunk/data/validator/geometry.mapcss

    r11049 r11133  
    195195node:unconnected:in-downloaded-area[waterway=waterfall],
    196196node:unconnected:in-downloaded-area[amenity=ferry_terminal],
     197node:unconnected:in-downloaded-area[leisure=slipway],
    197198node:unconnected:in-downloaded-area[mountain_pass=yes],
    198199node:unconnected:in-downloaded-area[barrier=gate],
  • trunk/data/validator/ignoretags.cfg

    r10996 r11133  
    170170K:hazmat:water=no
    171171K:hazmat:water=permissive
     172K:lanes=7
     173K:lanes=8
     174K:lanes=9
     175K:oneway=-1
    172176;
    173177; Amenity Key/Value Pairs
Note: See TracChangeset for help on using the changeset viewer.