Changeset 19169 in josm for trunk/resources


Ignore:
Timestamp:
2024-08-06T21:54:55+02:00 (3 months ago)
Author:
taylor.smock
Message:

Add/ignore documented popular tags

Add

Ignored tags:

Note:
Most gate barriers were changed to either be a node or a way, as it allows for
people to micromap.

Location:
trunk/resources
Files:
10 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r19165 r19169  
    77    <!-- Item chunks -->
    88    <chunk id="surface">
    9         <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,unhewn_cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,rock,sand,grass,wood,metal" />
     9        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,unhewn_cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,rock,sand,grass,wood,metal,stone,woodchips" />
    1010    </chunk>
    1111    <chunk id="surface_smoothness">
    … …  
    2323    </chunk>
    2424    <chunk id="sport_surface">
    25         <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,acrylic,grass,sand,tartan,ground" />
     25        <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,acrylic,grass,sand,tartan,ground,woodchips" />
    2626    </chunk>
    2727    <chunk id="riding_surface">
    28         <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
     28        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted,woodchips" />
    2929    </chunk>
    3030    <chunk id="highway_base">
    … …  
    195195        <reference ref="oh_wheelchair" />
    196196    </chunk>
     197    <chunk id="toilets">
     198        <check key="toilets" />
     199        <check key="toilets:unisex" />
     200        <combo key="toilets:wheelchair" values="yes,no,limited" values_context="toilets" />
     201        <combo key="toilets:access" values="customers,yes,no" />
     202    </chunk>
    197203    <chunk id="color">
    198204        <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" values_context="color" />
    … …  
    322328    </chunk>
    323329    <chunk id="leaf">
    324         <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
     330        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless,palm" values_searchable="true" />
    325331        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
    326332            <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
    … …  
    332338    </chunk>
    333339    <chunk id="leaf_without_mixed">
    334         <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" />
     340        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless,palm" values_searchable="true" />
    335341        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
    336342            <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
    … …  
    799805                <reference ref="highway_base" />
    800806                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
    801                 <checkgroup columns="4">
     807                <checkgroup columns="3">
    802808                    <check key="motorroad" text="Motorroad" />
    803809                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
    804810                    <check key="narrow" text="Narrow" disable_off="true" />
    805811                    <check key="trolley_wire" text="Overhead trolley wires" />
     812                    <check key="frontage_road" text="Frontage road" disable_off="true" />
    806813                </checkgroup>
    807814                <reference ref="placement_shoulder" />
    … …  
    835842                <reference ref="highway_base" />
    836843                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
    837                 <checkgroup columns="3">
     844                <checkgroup columns="2">
    838845                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
    839846                    <check key="narrow" text="Narrow" disable_off="true" />
    840847                    <check key="trolley_wire" text="Overhead trolley wires" />
     848                    <check key="frontage_road" text="Frontage road" disable_off="true" />
    841849                </checkgroup>
    842850                <reference ref="placement_shoulder" />
    … …  
    868876                <reference ref="highway_base" />
    869877                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
    870                 <checkgroup columns="3">
     878                <checkgroup columns="2">
    871879                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
    872880                    <check key="narrow" text="Narrow" disable_off="true" />
    873881                    <check key="trolley_wire" text="Overhead trolley wires" />
     882                    <check key="frontage_road" text="Frontage road" disable_off="true" />
    874883                </checkgroup>
    875884                <reference ref="placement_shoulder" />
    … …  
    10151024            <space />
    10161025            <key key="highway" value="service" />
    1017             <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through,emergency_access" />
     1026            <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through,emergency_access,slipway" />
    10181027            <optional>
    10191028                <text key="name" text="Name" />
    … …  
    11431152            <label text="Vehicles per type" />
    11441153            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    1145             <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
     1154            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,customers,no" values_sort="false" match="key" />
    11461155            <check key="cyclestreet" text="Bicycle street" disable_off="true" />
    11471156            <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
    … …  
    13041313            <check key="oneway:bicycle" text="Oneway (bicycle)" />
    13051314            <space />
     1315            <optional text="Cycleway Lane Attributes">
     1316                <combo key="cycleway:both:lane" text="Lane type (both)" values_context="cycleway" values="advisory,exclusive"/>
     1317                <combo key="cycleway:left:lane" text="Lane type (left)" values_context="cycleway" values="advisory,exclusive"/>
     1318                <combo key="cycleway:right:lane" text="Lane type (right)" values_context="cycleway" values="advisory,exclusive"/>
     1319            </optional>
    13061320            <optional text="Edit Highway Attributes:">
    13071321                <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" values_sort="false" />
    … …  
    14401454            <optional>
    14411455                <reference ref="name_operator" />
    1442                 <check key="toilets" text="Toilets" />
     1456                <reference ref="toilets" />
    14431457            </optional>
    14441458        </item> <!-- Services -->
    … …  
    14481462            <optional>
    14491463                <text key="name" text="Name" />
    1450                 <check key="toilets" text="Toilets" />
     1464                <reference ref="toilets" />
    14511465                <check key="drinking_water" text="Drinking Water" />
    14521466            </optional>
    … …  
    15151529                <list_entry value="traffic_signals" icon="presets/vehicle/crossing_traffic_signals.svg" />
    15161530                <list_entry value="unmarked" icon="presets/vehicle/crossing_unmarked.svg" />
     1531                <list_entry value="informal" icon="presets/vehicle/crossing_unmarked.svg" />
    15171532            </combo>
    15181533            <reference ref="crossing_markings" />
    … …  
    15851600            <link wiki="Tag:highway=passing_place" />
    15861601            <key key="highway" value="passing_place" />
     1602            <preset_link preset_name="Emergency Bay" text="Similar but different tags:"/>
    15871603        </item> <!-- Passing Place -->
     1604        <item name="Emergency Bay" icon="presets/vehicle/emergency_bay.svg" type="node,way" preset_name_label="true">
     1605            <link wiki="Tag:highway=emergency_bay" />
     1606            <key key="highway" value="emergency_bay" />
     1607            <optional text="Node attributes">
     1608                <combo key="direction" text="Direction" values="forward,backward" values_sort="false" />
     1609            </optional>
     1610            <optional text="Way attributes">
     1611                <reference ref="highway_base" />
     1612                <reference ref="highway_yesno" />
     1613                <checkgroup columns="2">
     1614                    <check key="oneway" text="Oneway" />
     1615                    <check key="oneway:bicycle" text="Oneway for bicycle" />
     1616                </checkgroup>
     1617                <reference ref="lit_common_no_times"/>
     1618                <text key="width" text="Width (meters)" />
     1619                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
     1620                <checkgroup columns="2">
     1621                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
     1622                    <check key="narrow" text="Narrow" disable_off="true" />
     1623                </checkgroup>
     1624            </optional>
     1625            <preset_link preset_name="Passing Place" text="Similar but different tags:"/>
     1626        </item>
    15881627        <item name="Turning Circle" icon="presets/vehicle/turning_circle.svg" type="node" preset_name_label="true">
    15891628            <link wiki="Tag:highway=turning_circle" />
    … …  
    16581697                <text key="website" text="Website" />
    16591698                <check key="drinking_water" text="Drinking Water" />
    1660                 <check key="toilets" text="Toilets" />
     1699                <reference ref="toilets" />
    16611700                <check key="bin" text="Waste Basket/Trash Can" />
    16621701            </optional>
    … …  
    18561895            <key key="barrier" value="wall" />
    18571896            <reference ref="optional_height" />
    1858             <combo key="wall" text="Type" values="brick,castle_wall,dry_stone,flood_wall,noise_barrier,seawall,stone" values_searchable="true" />
     1897            <combo key="wall" text="Type" values="brick,castle_wall,concrete,dry_stone,flood_wall,noise_barrier,seawall,stone" values_searchable="true" />
    18591898            <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
    18601899        </item> <!-- Wall -->
    … …  
    19121951            <preset_link preset_name="Access Restrictions" />
    19131952        </item> <!-- Entrance (Barrier Opening) -->
    1914         <item name="Gate" icon="presets/barrier/gate.svg" type="node" preset_name_label="true">
     1953        <item name="Gate" icon="presets/barrier/gate.svg" type="node,way" preset_name_label="true">
    19151954            <link wiki="Tag:barrier=gate" />
    19161955            <key key="barrier" value="gate" />
    … …  
    19241963            <preset_link preset_name="Access Restrictions" />
    19251964        </item> <!-- Gate -->
    1926         <item name="Lift Gate" icon="presets/barrier/lift_gate.svg" type="node" preset_name_label="true">
     1965        <item name="Lift Gate" icon="presets/barrier/lift_gate.svg" type="node,way" preset_name_label="true">
    19271966            <link wiki="Tag:barrier=lift_gate" />
    19281967            <key key="barrier" value="lift_gate" />
    … …  
    19381977            <preset_link preset_name="Access Restrictions" />
    19391978        </item> <!-- Lift Gate -->
    1940         <item name="Swing Gate" icon="presets/barrier/swing_gate.svg" type="node" preset_name_label="true">
     1979        <item name="Swing Gate" icon="presets/barrier/swing_gate.svg" type="node,way" preset_name_label="true">
    19411980            <link wiki="Tag:barrier=swing_gate" />
    19421981            <key key="barrier" value="swing_gate" />
    … …  
    19521991            <preset_link preset_name="Access Restrictions" />
    19531992        </item> <!-- Swing Gate -->
    1954         <item name="Hampshire Gate" type="node" preset_name_label="true">
     1993        <item name="Hampshire Gate" type="node,way" preset_name_label="true">
    19551994            <link wiki="Tag:barrier=hampshire_gate" />
    19561995            <key key="barrier" value="hampshire_gate" />
    … …  
    19652004            <preset_link preset_name="Access Restrictions" />
    19662005        </item> <!-- Hampshire Gate -->
    1967         <item name="Bump Gate" type="node" preset_name_label="true">
     2006        <item name="Bump Gate" type="node,way" preset_name_label="true">
    19682007            <link wiki="Tag:barrier=bump_gate" />
    19692008            <key key="barrier" value="bump_gate" />
    … …  
    19782017            <preset_link preset_name="Access Restrictions" />
    19792018        </item> <!-- Bump Gate -->
    1980         <item name="Kissing Gate" icon="presets/barrier/kissing_gate.svg" type="node" preset_name_label="true">
     2019        <item name="Kissing Gate" icon="presets/barrier/kissing_gate.svg" type="node,way" preset_name_label="true">
    19812020            <link wiki="Tag:barrier=kissing_gate" />
    19822021            <key key="barrier" value="kissing_gate" />
    … …  
    19912030            <preset_link preset_name="Access Restrictions" />
    19922031        </item> <!-- Kissing Gate -->
     2032        <item name="Wicket Gate" icon="presets/barrier/wicket_gate.svg" type="node,way" preset_name_label="true">
     2033            <label text="A pedestrian door or gate near a larger gate"/>
     2034            <link wiki="Tag:barrier=wicket_gate" />
     2035            <key key="barrier" value="wicket_gate" />
     2036            <reference ref="optional_maxwidth" />
     2037            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
     2038            <space />
     2039            <label text="The tag `foot=yes` is implied and does not need to be set." />
     2040            <space />
     2041            <reference ref="highway_access_vehicle" />
     2042            <reference ref="check_access_nomotor" />
     2043            <check key="locked" text="Usually locked"/>
     2044            <preset_link preset_name="Access Restrictions" />
     2045        </item> <!-- Wicket Gate -->
    19932046        <item name="Height Restrictor" icon="presets/barrier/height_restrictor.svg" type="node" preset_name_label="true">
    19942047            <link wiki="Tag:barrier=height_restrictor" />
    … …  
    28442897            <space />
    28452898            <key key="amenity" value="parking_space" />
    2846             <combo key="parking_space" text="Type of parking space" values="disabled,normal" />
     2899            <combo key="parking_space" text="Type of parking space" values="disabled,normal,charging" />
    28472900            <reference ref="parking_name_ref" />
    28482901            <text key="capacity" text="Capacity" />
    … …  
    28522905            <check key="covered" text="Covered (with roof)" />
    28532906        </item> <!-- Parking Space -->
     2907        <item name="Trolley Bay/Cart Corral" icon="presets/vehicle/parking/trolley_bay.svg" type="node,closedway" preset_name_label="true">
     2908            <link wiki="Tag:amenity=trolley_bay" />
     2909            <label text="This is for shopping carts, not public transport vehicles." text_context="Tag:amenity=trolley_bay" />
     2910            <space />
     2911            <key key="amenity" value="trolley_bay" />
     2912        </item>
    28542913        <item name="Parking Entrance/Exit" icon="presets/vehicle/parking/parking.svg" type="node" preset_name_label="true">
    28552914            <link wiki="Tag:amenity=parking_entrance" />
    … …  
    29863045            <reference ref="car_brands" />
    29873046            <reference ref="name_operator_oh_wheelchair" />
    2988             <multiselect key="service" text="Service" text_context="shop=car_repair" values="dealer;repair;parts;tyres" rows="4" />
     3047            <multiselect key="service" text="Service" text_context="shop=car_repair" values="dealer;repair;parts;tyres;inspection" rows="4" />
     3048            <optional text="Alternate service tagging">
     3049                <checkgroup columns="4">
     3050                    <check key="service:vehicle:car_repair" text="Car repair" text_context="shop=car_repair"/> <!-- If it doesn't repair cars, we want to know -->
     3051                    <check key="service:vehicle:truck_repair" text="Truck repair" text_context="shop=car_repair"/> <!-- If it doesn't repair trucks, we want to know -->
     3052                    <check key="service:vehicle:new_car_sales" text="Sells new cars" text_context="shop=car_repair" disable_off="true"/>
     3053                    <check key="service:vehicle:used_car_sales" text="Sells used cars" text_context="shop=car_repair" disable_off="true"/>
     3054                    <check key="service:vehicle:air_conditioning" text="Repairs AC" text_context="shop=car_repair" disable_off="true"/>
     3055                    <check key="service:vehicle:alignment" text="Aligns tyres" text_context="shop=car_repair" disable_off="true"/>
     3056                    <check key="service:vehicle:batteries" text="Repairs/replaces batteries" text_context="shop=car_repair" disable_off="true"/>
     3057                    <check key="service:vehicle:body_repair" text="Repairs body" text_context="shop=car_repair" disable_off="true"/>
     3058                    <check key="service:vehicle:brakes" text="Services brakes" text_context="shop=car_repair" disable_off="true"/>
     3059                    <check key="service:vehicle:car_parts" text="Sells car parts" text_context="shop=car_repair" disable_off="true"/>
     3060                    <check key="service:vehicle:diagnostics" text="Performs diagnostics" text_context="shop=car_repair" disable_off="true"/>
     3061                    <check key="service:vehicle:electrical" text="Repairs electrical" text_context="shop=car_repair" disable_off="true"/>
     3062                    <check key="service:vehicle:glass" text="Repairs glass" text_context="shop=car_repair" disable_off="true"/>
     3063                    <check key="service:vehicle:inspection" text="State mandated inspections" text_context="shop=car_repair" disable_off="true"/>
     3064                    <check key="service:vehicle:motor" text="Repairs motor" text_context="shop=car_repair" disable_off="true"/>
     3065                    <check key="service:vehicle:muffler" text="Repairs muffler" text_context="shop=car_repair" disable_off="true"/>
     3066                    <check key="service:vehicle:oil_change" text="Performs oil changes" text_context="shop=car_repair" disable_off="true"/>
     3067                    <check key="service:vehicle:painting" text="Paints exterior" text_context="shop=car_repair" disable_off="true"/>
     3068                    <check key="service:vehicle:transmission" text="Repairs transmission" text_context="shop=car_repair" disable_off="true"/>
     3069                    <check key="service:vehicle:tyres" text="Replaces tires" text_context="shop=car_repair" disable_off="true"/>
     3070                </checkgroup>
     3071            </optional>
    29893072            <reference ref="link_contact_address_payment" />
    29903073        </item> <!-- Repair -->
    … …  
    30123095            <reference ref="link_contact_address_payment" />
    30133096        </item> <!-- Rental -->
     3097        <item name="Vehicle Inspection" icon="presets/vehicle/vehicle_inspection.svg" type="node,closedway,multipolygon" preset_name_label="true">
     3098            <link wiki="Tag:amenity=vehicle_inspection" />
     3099            <space />
     3100            <key key="amenity" value="vehicle_inspection" />
     3101            <reference ref="name_brand_operator_oh_wheelchair" />
     3102            <reference ref="link_contact_address_payment" />
     3103            <preset_link preset_name="Repair" text="Similar but different tags:"/>
     3104        </item> <!-- Vehicle Inspection -->
    30143105        <item name="Pooling" icon="presets/vehicle/car_pooling.svg" type="node,closedway,multipolygon" preset_name_label="true">
    30153106            <link wiki="Tag:amenity=car_pooling" />
    … …  
    36733764            <text key="capacity" text="Capacity" />
    36743765            <reference ref="fee" />
    3675             <check key="toilets" text="Toilets" />
     3766            <reference ref="toilets" />
    36763767            <check key="shower" text="Shower" />
    36773768            <combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
    … …  
    37603851            <reference ref="internet_smoking" />
    37613852            <preset_link preset_name="Diet" />
     3853            <reference ref="toilets" />
    37623854            <reference ref="link_contact_address_payment" />
    37633855        </item> <!-- Restaurant -->
    … …  
    37753867            <reference ref="internet_smoking" />
    37763868            <preset_link preset_name="Diet" />
     3869            <reference ref="toilets" />
    37773870            <reference ref="link_contact_address_payment" />
    37783871            <preset_link preset_name="Building" />
    … …  
    38023895            <reference ref="internet_smoking" />
    38033896            <preset_link preset_name="Diet" />
     3897            <reference ref="toilets" />
    38043898            <reference ref="link_contact_address_payment" />
    38053899        </item> <!-- Cafe -->
    … …  
    38163910            <reference ref="internet_smoking" />
    38173911            <preset_link preset_name="Diet" />
     3912            <reference ref="toilets" />
    38183913            <reference ref="link_contact_address_payment" />
    38193914        </item> <!-- Ice cream -->
    … …  
    38313926            <reference ref="internet_smoking" />
    38323927            <preset_link preset_name="Diet" />
     3928            <reference ref="toilets" />
    38333929            <reference ref="link_contact_address_payment" />
    38343930        </item> <!-- Pub -->
    … …  
    38433939            <reference ref="internet_smoking" />
    38443940            <preset_link preset_name="Diet" />
     3941            <reference ref="toilets" />
    38453942            <reference ref="link_contact_address_payment" />
    38463943        </item> <!-- Beer Garden -->
    … …  
    38613958            <reference ref="internet_smoking" />
    38623959            <preset_link preset_name="Diet" />
     3960            <reference ref="toilets" />
    38633961            <reference ref="link_contact_address_payment" />
    38643962        </item> <!-- Bar -->
    … …  
    46544752            <reference ref="link_contact_address" />
    46554753        </item> <!-- Language school -->
     4754        <item name="Music school" icon="presets/education/music_school.svg" type="node,closedway,multipolygon" preset_name_label="true">
     4755            <link wiki="Tag:amenity=music_school" />
     4756            <space />
     4757            <key key="amenity" value="music_school" />
     4758            <reference ref="name_operator_oh_wheelchair" />
     4759            <reference ref="school_common"/>
     4760            <reference ref="link_contact_address" />
     4761        </item> <!-- Music school -->
    46564762    </group> <!-- Education -->
    46574763    <group name="Animal" icon="presets/health/animal_shelter.svg">   
    … …  
    49705076            <reference ref="link_contact_address" />
    49715077        </item> <!-- Food Bank -->
     5078        <item name="Social Centre" icon="presets/social_facility/social_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5079            <link wiki="Tag:amenity=social_centre" />
     5080            <space />
     5081            <key key="amenity" value="social_centre" />
     5082            <reference ref="name_operator_oh_wheelchair" />
     5083            <reference ref="link_contact_address" />
     5084        </item>
    49725085    </group> <!-- Social Facility -->
    49735086    <group name="Facilities" icon="presets/service/telephone.svg">
    … …  
    54645577            <reference ref="sport_surface" />
    54655578        </item> <!-- Running -->
    5466         <item name="Climbing site" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    5467             <link wiki="Tag:sport=climbing" />
    5468             <space />
    5469             <key key="sport" value="climbing" />
    5470             <text key="name" text="Name" />
    5471             <combo key="leisure" text="Type" values="sports_centre" />
    5472             <reference ref="climbing_styles" />
    5473             <text key="climbing:routes" text="Number of routes" />
    5474             <text key="ele" text="Usual elevation at the bottom of the routes" length="10" />
    5475             <space />
    5476             <combo key="climbing:length" text="Usual route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
    5477             <combo key="climbing:length:min" text="Minimal climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
    5478             <combo key="climbing:length:max" text="Maximum climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
    5479             <space />
    5480             <combo key="climbing:grade:uiaa:min" text="UIAA: Simplest route" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
    5481             <combo key="climbing:grade:uiaa:max" text="UIAA: Most difficult route" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
    5482             <combo key="climbing:grade:uiaa:mean" text="UIAA: Main difficulty" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
    5483             <space />
    5484             <combo key="climbing:grade:french:min" text="French: Simplest route" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
    5485             <combo key="climbing:grade:french:max" text="French: Most difficult route" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
    5486             <combo key="climbing:grade:french:mean" text="French: Main difficulty" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
    5487             <space />
    5488             <combo key="climbing:grade:saxon:min" text="Saxon: Simplest route" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
    5489             <combo key="climbing:grade:saxon:max" text="Saxon: Most difficult route" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
    5490             <combo key="climbing:grade:saxon:mean" text="Saxon: Main difficulty" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
    5491             <reference ref="climbing_optional_attributes" />
    5492             <space />
    5493         </item> <!-- Climbing site -->
    5494         <item name="Climbing route" icon="presets/sport/climbing.svg" type="node,way" preset_name_label="true">
    5495             <link wiki="Tag:sport=climbing" />
    5496             <space />
    5497             <key key="sport" value="climbing" />
    5498             <key key="climbing" value="route" />
    5499             <text key="name" text="Name" />
    5500             <reference ref="climbing_styles" />
    5501             <combo key="climbing:bolted" text="Bolts" values="yes,no,1,2,3,4,5,6" values_sort="false" values_no_i18n="true" />
    5502             <combo key="climbing:pitches" text="Pitches" values="1,2,3,4,5,6,7,8" default="1" values_no_i18n="true" />
    5503             <combo key="climbing:length" text="Route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
    5504             <space />
    5505             <combo key="climbing:grade:uiaa" text="UIAA grading" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
    5506             <combo key="climbing:grade:french" text="French grading" values="4,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
    5507             <combo key="climbing:grade:saxon" text="Saxon grading" values="IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
    5508             <reference ref="climbing_optional_attributes" />
    5509         </item> <!-- Climbing route -->
     5579        <group name="Climbing" icon="presets/sport/climbing.svg">
     5580            <item name="Climbing site" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
     5581                <link wiki="Tag:sport=climbing" />
     5582                <space />
     5583                <key key="sport" value="climbing" />
     5584                <text key="name" text="Name" />
     5585                <combo key="leisure" text="Type" values="sports_centre" />
     5586                <reference ref="climbing_styles" />
     5587                <text key="climbing:routes" text="Number of routes" />
     5588                <text key="ele" text="Usual elevation at the bottom of the routes" length="10" />
     5589                <space />
     5590                <combo key="climbing:length" text="Usual route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
     5591                <combo key="climbing:length:min" text="Minimal climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
     5592                <combo key="climbing:length:max" text="Maximum climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
     5593                <space />
     5594                <combo key="climbing:grade:uiaa:min" text="UIAA: Simplest route" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
     5595                <combo key="climbing:grade:uiaa:max" text="UIAA: Most difficult route" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
     5596                <combo key="climbing:grade:uiaa:mean" text="UIAA: Main difficulty" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
     5597                <space />
     5598                <combo key="climbing:grade:french:min" text="French: Simplest route" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
     5599                <combo key="climbing:grade:french:max" text="French: Most difficult route" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
     5600                <combo key="climbing:grade:french:mean" text="French: Main difficulty" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
     5601                <space />
     5602                <combo key="climbing:grade:saxon:min" text="Saxon: Simplest route" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
     5603                <combo key="climbing:grade:saxon:max" text="Saxon: Most difficult route" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
     5604                <combo key="climbing:grade:saxon:mean" text="Saxon: Main difficulty" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
     5605                <reference ref="climbing_optional_attributes" />
     5606                <space />
     5607            </item> <!-- Climbing site -->
     5608            <item name="Climbing route bottom" icon="presets/sport/climbing_route_bottom.svg" type="node" preset_name_label="true">
     5609                <link wiki="Tag:climbing=route_bottom" />
     5610                <space />
     5611                <key key="climbing" value="route_bottom" />
     5612            </item> <!-- Climbing route bottom -->
     5613            <item name="Climbing route" icon="presets/sport/climbing.svg" type="node,way" preset_name_label="true">
     5614                <link wiki="Tag:sport=climbing" />
     5615                <space />
     5616                <key key="sport" value="climbing" />
     5617                <key key="climbing" value="route" />
     5618                <text key="name" text="Name" />
     5619                <reference ref="climbing_styles" />
     5620                <combo key="climbing:bolted" text="Bolts" values="yes,no,1,2,3,4,5,6" values_sort="false" values_no_i18n="true" />
     5621                <combo key="climbing:pitches" text="Pitches" values="1,2,3,4,5,6,7,8" default="1" values_no_i18n="true" />
     5622                <combo key="climbing:length" text="Route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
     5623                <space />
     5624                <combo key="climbing:grade:uiaa" text="UIAA grading" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
     5625                <combo key="climbing:grade:french" text="French grading" values="4,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
     5626                <combo key="climbing:grade:saxon" text="Saxon grading" values="IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
     5627                <reference ref="climbing_optional_attributes" />
     5628            </item> <!-- Climbing route -->
     5629            <item name="Climbing route top" icon="presets/sport/climbing_route_top.svg" type="node" preset_name_label="true">
     5630                <link wiki="Tag:climbing=route_top" />
     5631                <space />
     5632                <key key="climbing" value="route_top" />
     5633            </item> <!-- Climbing route top -->
     5634        </group>
    55105635        <item name="Canoeing/Kayaking" icon="presets/sport/canoe.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    55115636            <link wiki="Tag:sport=canoe" />
    … …  
    58715996            <link wiki="Key:building" />
    58725997            <space />
    5873             <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,riding_hall,roof,ruins,school,service,shed,silo,sports_centre,sports_hall,stable,stadium,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
     5998            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,container,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,riding_hall,roof,ruins,school,service,shed,silo,sports_centre,sports_hall,stable,stadium,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
    58745999            <optional>
    58756000                <reference ref="name_operator" />
    … …  
    59216046                <list_entry value="yes" icon="presets/misc/entrance_yes.svg" />
    59226047                <list_entry value="main" icon="presets/misc/entrance_main.svg" />
     6048                <list_entry value="secondary" icon="presets/misc/entrance_yes.svg" />
    59236049                <list_entry value="service" icon="presets/misc/entrance_service.svg" />
    59246050                <list_entry value="shop" icon="presets/misc/entrance_yes.svg" />
    … …  
    73997525            <key key="shop" value="supermarket" />
    74007526            <reference ref="name_oh_wheelchair" />
     7527            <reference ref="toilets" />
    74017528            <reference ref="link_contact_address_payment" />
    74027529        </item> <!-- Supermarket -->
    … …  
    74067533            <key key="shop" value="convenience" />
    74077534            <reference ref="name_oh_wheelchair" />
     7535            <reference ref="toilets" />
    74087536            <reference ref="link_contact_address_payment" />
    74097537        </item> <!-- Convenience Store -->
    … …  
    75137641            <key key="amenity" value="marketplace" />
    75147642            <reference ref="name_operator_oh_wheelchair" />
     7643            <reference ref="toilets" />
    75157644            <text key="website" text="Website" />
    75167645            <combo key="organic" text="Organic" values="yes,no,only" />
    … …  
    76247753            <check key="self_service" text="Self Service" />
    76257754            <check key="laundry_service" text="Laundry Service" />
     7755            <reference ref="toilets" />
    76267756            <reference ref="link_contact_address_payment" />
    76277757        </item> <!-- Laundry -->
    … …  
    80688198            <reference ref="link_contact_address_payment" />
    80698199        </item> <!-- Paint -->
     8200        <item name="Craft" icon="presets/shop/craft.svg" type="node,closedway,multipolygon" preset_name_label="true">
     8201            <link wiki="Tag:shop=craft" />
     8202            <space />
     8203            <key key="shop" value="craft" />
     8204            <reference ref="name_operator_oh_wheelchair" />
     8205            <check key="training" text="Provides classes" text_context="Tag:shop=craft" />
     8206            <reference ref="link_contact_address_payment" />
     8207        </item>
    80708208        <item name="Gas" icon="presets/shop/gas.svg" type="node,closedway,multipolygon" preset_name_label="true">
    80718209            <link wiki="Tag:shop=gas" />
    … …  
    82448382            <reference ref="link_contact_address_payment" />
    82458383        </item> <!-- Funeral Directors -->
     8384        <item name="Farm Store" icon="presets/shop/agrarian.svg" type="node,closedway,multipolygon" preset_name_label="true">
     8385            <link wiki="Tag:shop=agrarian" />
     8386            <space />
     8387            <key key="shop" value="agrarian" />
     8388            <reference ref="name_oh_wheelchair" />
     8389            <optional>
     8390                <combo key="agrarian" values="yes,pesticide,fertilizer,seed,feed,tools,machine_parts,agricultural_machinery" values_context="Tag:shop=agrarian" />
     8391            </optional>
     8392            <reference ref="link_contact_address_payment" />
     8393        </item>
    82468394    </group> <!-- Other -->
    82478395        <separator/>

  • trunk/resources/data/validator/deprecated.mapcss

    r19025 r19169  
    25302530  suggestAlternative: "{1.key}";
    25312531}
     2532/* From the canvec import */
     2533*[natural=landform][landform=esker] {
     2534  throwWarning: tr("{0} should be replaced by {1}", "{1.tag}", "geological=esker";
     2535  group: tr("deprecated tagging");
     2536  suggestAlternative: "natural=ridge or geological=esker";
     2537}
     2538*[natural=landform][landform=moraine] {
     2539  throwWarning: tr("{0} should be replaced by {1}", "{1.tag}", "geological=moraine";
     2540  group: tr("deprecated tagging");
     2541  suggestAlternative: "geological=moraine";
     2542}
     2543*[natural=landform][landform=beach] {
     2544  throwWarning: tr("{0} should be replaced by {1}", "{1.tag}", "natural=beach";
     2545  group: tr("deprecated tagging");
     2546  suggestAlternative: "natural=beach";
     2547}
     2548*[natural=landform][landform=tundra_polygon] {
     2549  throwWarning: tr("{0} should be replaced by {1}", "{1.tag}", "natural=tundra";
     2550  group: tr("deprecated tagging");
     2551  suggestAlternative: "natural=tundra or natural=fell";
     2552}
    25322553
    25332554/* When tags are deprecated they should be added to ignoretags.cfg too. */

  • trunk/resources/data/validator/ignoretags.cfg

    r19027 r19169  
    802802; orchard=meadow_orchard seems to be more of a boolean value, "also happens to be a meadow". Don't know how we want to handle it.
    803803K:orchard=meadow_orchard
     804K:meadow=meadow_orchard
    804805; boundary=religious_administration is not well documented (2023-09-21)
    805806K:boundary=religious_administration
    … …  
    815816K:road_marking=solid_stop_line
    816817K:service=irrigation
     818; canvec import
     819K:natural=landform
     820K:landform=esker
     821K:landform=moraine
     822K:landform=beach
     823K:landform=tundra_polygon
     824; This seems to be a region specific tag.
     825K:valley=balka
    817826
    818827; These tags should probably have better software support, but maybe they can be in the appropriate section in this file.

  • trunk/resources/data/validator/unnecessary.mapcss

    r19028 r19169  
    6868
    6969/* see ticket #7639 -- Warn when a node has the same tags as its parent way. */
    70 way >:sameTags node:tagged {
     70/* But don't warn on barrier tags -- a common mapping method will have a barrier on the routable way and then the micromapped barrier */
     71way[!barrier] >:sameTags node:tagged {
    7172  throwWarning: tr("Nodes duplicating parent way tags");
    7273}

  • trunk/resources/styles/standard/elemstyles.mapcss

    r19026 r19169  
    413413    icon-image: "presets/barrier/gate.svg";
    414414    set icon_z17;
     415}
     416way[barrier=gate],
     417way[barrier=lift_gate],
     418way[barrier=swing_gate],
     419way[barrier=hampshire_gate],
     420way[barrier=bump_gate],
     421way[barrier=kissing_gate],
     422way[barrier=wicket_gate] {
     423    width: 2;
     424    color: barrier-opening#88F050;
    415425}
    416426way[barrier=yes],
    … …  
    502512    set icon_z17;
    503513}
     514node[barrier=wicket_gate] {
     515    icon-image: "presets/barrier/wicket_gate.svg";
     516    set icon_z17;
     517}
    504518node[barrier=height_restrictor] {
    505519    icon-image: "presets/barrier/height_restrictor.svg";
    … …  
    616630    color: street#c0c0c0;
    617631}
    618 way[highway=escape] {
     632way[highway=escape],
     633way[highway=emergency_bay] {
    619634    width: 3;
    620635    color: street#c0c0c0;
    … …  
    830845    set icon_z17;
    831846}
    832 node[highway=crossing][crossing=unmarked] {
     847node[highway=crossing][crossing=unmarked],
     848node[highway=crossing][crossing=informal] {
    833849    icon-image: "presets/vehicle/crossing_unmarked.svg";
    834850    set icon_z17;
    … …  
    947963node[highway=passing_place] {
    948964    icon-image: "presets/vehicle/passing_place.svg";
     965    set icon_z17;
     966}
     967node[highway=emergency_bay] {
     968    icon-image: "presets/vehicle/emergency_bay.svg";
    949969    set icon_z17;
    950970}
    … …  
    23782398area[shop=pastry],
    23792399area[shop=copyshop],
     2400area[shop=craft],
    23802401area[shop=curtain],
    23812402area[shop=cycle_repair],
    … …  
    24542475area[shop=weapons],
    24552476area[shop=funeral_directors],
     2477area[shop=agrarian],
    24562478area[shop=wine],
    24572479area[shop=farm],
    … …  
    25662588    set icon_z17;
    25672589}
     2590node[shop=craft] {
     2591    icon-image: "presets/shop/craft.svg";
     2592    set icon_z17;
     2593}
    25682594node[shop=curtain] {
    25692595    icon-image: "presets/shop/curtain.svg";
    … …  
    28682894node[shop=funeral_directors] {
    28692895    icon-image: "presets/shop/funeral_directors.svg";
     2896    set icon_z17;
     2897}
     2898node[shop=agrarian] {
     2899    icon-image: "presets/shop/agrarian.svg";
    28702900    set icon_z17;
    28712901}
    … …  
    30823112    fill-color: parking_space#f7efb8;
    30833113}
     3114area[amenity=trolley_bay] {
     3115    fill-color: trolley_bay#b8d8f7;
     3116}
    30843117area[amenity=parking],
    30853118area[amenity=motorcycle_parking],
    … …  
    30973130node[amenity=parking_space] {
    30983131    icon-image: "presets/vehicle/parking/parking_space.svg";
     3132    set icon_z17;
     3133}
     3134node[amenity=trolley_bay] {
     3135    icon-image: "presets/vehicle/parking/trolley_bay.svg";
    30993136    set icon_z17;
    31003137}
    … …  
    32773314area[amenity=kindergarten],
    32783315area[amenity=language_school],
     3316area[amenity=music_school],
    32793317area[amenity=driving_school] {
    32803318    fill-color: amenity_light#f7efb7;
    … …  
    34063444node[amenity=driving_school] {
    34073445    icon-image: "presets/education/driving_school.svg";
     3446    set icon_z17;
     3447}
     3448node[amenity=music_school] {
     3449    icon-image: "presets/education/music_school.svg";
    34083450    set icon_z17;
    34093451}
    … …  
    47544796node[sport=climbing] {
    47554797    icon-image: "presets/sport/climbing.svg";
     4798    set icon_z17;
     4799}
     4800node[climbing=route_bottom] {
     4801    icon-image: "presets/sport/climbing_route_bottom.svg";
     4802    set icon_z17;
     4803}
     4804node[climbing=route_top] {
     4805    icon-image: "presets/sport/climbing_route_top.svg";
    47564806    set icon_z17;
    47574807}
Note: See TracChangeset for help on using the changeset viewer.