Changeset 7620 in josm


Ignore:
Timestamp:
2014-10-14T01:27:10+02:00 (10 years ago)
Author:
Don-vip
Message:

fix #10530 - preset update (patch by skyper) + deprecate fee=interval

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r7613 r7620  
    284284        <reference ref="oh" />
    285285    </chunk>
    286     <chunk id="internet_smoking_wheelchair">
     286    <chunk id="internet">
    287287        <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    288288        <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     289    </chunk>
     290    <chunk id="internet_smoking_wheelchair">
     291        <reference ref="internet" />
    289292        <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    290293        <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    … …  
    326329        <check key="payment:account_cards" text="Account or loyalty cards" />
    327330    </chunk>
     331    <chunk id="fee">
     332        <combo key="fee" text="Fee" values="yes,no" />
     333    </chunk>
     334    <chunk id="fee_interval">
     335        <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
     336    </chunk>
    328337    <chunk id="parking_name_type_ref">
    329338        <text key="name" text="Name" />
    … …  
    334343        <space />
    335344        <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
    336         <combo key="fee" text="Fee" values="yes,no,interval" />
     345        <reference ref="fee_interval" />
    337346        <text key="operator" text="Operator" />
    338347        <reference ref="surface" />
    339         <space />
    340348    </chunk>
    341349    <chunk id="maxstay">
    342350        <combo key="maxstay" text="Time Limit (minutes)" values="0,30,60,90,120,180" />
    343351    </chunk>
     352    <chunk id="supervised">
     353        <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
     354    </chunk>
    344355    <chunk id="supervised_lit_oh">
    345         <combo key="supervised" text="Supervised" values="yes,no,interval" />
    346         <combo key="lit" text="Lit" values="yes,no,interval" />
     356        <reference ref="supervised" />
     357        <combo key="lit" text="Lit" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
    347358        <reference ref="oh" />
    348359    </chunk>
    … …  
    11861197                <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    11871198                <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
    1188                 <check key="supervised" text="Crossing attendant" />
     1199                <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
    11891200                <check key="bicycle" text="Cross by bicycle" />
    11901201                <check key="horse" text="Cross on horseback" />
    … …  
    12341245            <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    12351246            <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
    1236             <check key="supervised" text="Crossing attendant" />
     1247            <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
    12371248            <check key="bicycle" text="Cross by bicycle" />
    12381249            <check key="horse" text="Cross on horseback" />
    … …  
    19871998            <reference ref="name_wikipedia" />
    19881999            <optional>
    1989                 <combo key="supervised" text="Supervised" values="yes,no,interval" />
     2000                <reference ref="supervised" />
    19902001                <reference ref="oh" />
    19912002                <reference ref="general_access" />
    … …  
    22442255            <key key="railway" value="level_crossing" />
    22452256            <optional>
    2246                 <check key="supervised" text="Supervised" />
     2257                <reference ref="supervised" />
    22472258                <check key="crossing:light" text="Traffic lights" />
    22482259                <check key="crossing:bell" text="Sound signals" />
    … …  
    22612272            <optional>
    22622273                <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
     2274                <reference ref="supervised" />
    22632275                <check key="horse" text="Cross on horseback" />
    22642276                <check key="bicycle" text="Cross by bicycle" />
    2265                 <check key="supervised" text="Supervised" />
    22662277                <check key="crossing:light" text="Traffic lights" />
    22672278                <check key="crossing:bell" text="Sound signals" />
    … …  
    26372648            <space />
    26382649            <key key="amenity" value="motorcycle_parking" />
    2639             <text key="name" text="Name" />
     2650            <reference ref="parking_name_type_ref" />
    26402651            <text key="capacity" text="Capacity" />
    2641             <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
    2642             <combo key="fee" text="Fee" values="yes,no" />
     2652            <reference ref="parking_access_fee_operator_surface" />
     2653            <reference ref="supervised_lit_oh" />
     2654            <check key="covered" text="Covered (with roof)" />
    26432655        </item> <!-- Parking -->
    26442656        <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true">
    … …  
    26852697            <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" />
    26862698            <check key="covered" text="Covered" />
    2687             <check key="supervised" text="Supervised" />
     2699            <reference ref="fee_interval" />
     2700            <reference ref="supervised_lit_oh" />
    26882701        </item> <!-- Parking -->
    26892702        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway" preset_name_label="true">
    … …  
    30963109            <key key="aeroway" value="terminal" />
    30973110            <text key="name" text="Name" />
    3098             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3099             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     3111            <reference ref="internet" />
    31003112            <reference ref="link_contact" />
    31013113        </item> <!-- Terminal -->
    … …  
    32243236            <space />
    32253237            <text key="capacity" text="Number of places" />
    3226             <combo key="fee" text="Requires a fee" values="yes,no,interval" />
     3238            <reference ref="fee_interval" />
    32273239            <check key="power_supply" text="Power supply" />
    32283240            <check key="tents" text="Tents allowed" />
    … …  
    34373449            <key key="information" value="office" />
    34383450            <reference ref="name_oh" />
    3439             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3440             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     3451            <reference ref="internet" />
    34413452            <reference ref="link_contact" />
    34423453        </item> <!-- Information Office -->
    … …  
    35163527            <text key="description" text="Closer description" />
    35173528            <text key="ref" text="Reference number" />
    3518             <combo key="fee" text="Fee" values="yes,no" />
    3519             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3520             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     3529            <reference ref="fee" />
     3530            <reference ref="internet" />
    35213531        </item> <!-- Information Terminal -->
    35223532        <item name="Audio Guide" icon="presets/information.png" type="node" preset_name_label="true">
    … …  
    35343544            <text key="description" text="Closer description" />
    35353545            <text key="ref" text="Reference number" />
    3536             <combo key="fee" text="Fee" values="yes,no" />
     3546            <reference ref="fee" />
    35373547            <space />
    35383548            <label text="Audioguide via mobile phone?" />
    … …  
    36423652            <key key="leisure" value="horse_riding" />
    36433653            <reference ref="name_operator_oh" />
    3644             <text key="fee" text="Fee" />
     3654            <reference ref="fee" />
    36453655            <space />
    36463656            <reference ref="contact" />
    … …  
    39994009            <space />
    40004010            <key key="amenity" value="community_centre" />
    4001             <reference ref="name_operator" />
    4002             <reference ref="oh" />
     4011            <reference ref="name_operator_oh" />
    40034012        </item> <!-- Community Centre -->
    40044013        <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true">
    … …  
    40364045            <space />
    40374046            <key key="amenity" value="prison" />
    4038             <text key="name" text="Name" />
     4047            <reference ref="name_operator" />
    40394048            <reference ref="link_contact" />
    40404049        </item> <!-- Prison -->
    … …  
    40794088            <space />
    40804089            <key key="amenity" value="post_office" />
    4081             <reference ref="name_operator" />
     4090            <reference ref="name_operator_oh" />
    40824091        </item> <!-- Post Office -->
    40834092    </group> <!-- Public Buildings -->
    … …  
    40934102            <space />
    40944103            <key key="amenity" value="kindergarten" />
    4095             <text key="name" text="Name" />
     4104            <reference ref="name_operator_oh" />
    40964105            <reference ref="link_contact" />
    40974106        </item> <!-- Kindergarten -->
    … …  
    41094118            <space />
    41104119            <key key="amenity" value="school" />
    4111             <text key="name" text="Name" />
     4120            <reference ref="name_operator_oh" />
    41124121            <reference ref="link_contact" />
    41134122        </item> <!-- School -->
    … …  
    41244133            <space />
    41254134            <key key="amenity" value="university" />
    4126             <text key="name" text="Name" />
     4135            <reference ref="name_operator" />
    41274136            <reference ref="link_contact" />
    41284137        </item> <!-- University -->
    … …  
    41364145            <space />
    41374146            <key key="amenity" value="college" />
    4138             <text key="name" text="Name" />
     4147            <reference ref="name_operator" />
    41394148            <reference ref="link_contact" />
    41404149        </item> <!-- College -->
    … …  
    41454154            <space />
    41464155            <key key="amenity" value="driving_school" />
    4147             <reference ref="name_operator" />
     4156            <reference ref="name_operator_oh" />
    41484157            <combo key="license_classes" text="License Classes" values="A;A1;B;BE;C,A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E" />
    41494158            <reference ref="link_contact" />
    … …  
    41704179            <space />
    41714180            <key key="amenity" value="clinic" />
    4172             <text key="name" text="Name" />
     4181            <reference ref="name_operator" />
    41734182            <reference ref="link_contact" />
    41744183        </item> <!-- Clinic -->
    … …  
    43134322            <optional>
    43144323                <text key="description" text="Description" />
    4315                 <combo key="fee" text="Fee" values="yes,no" />
     4324                <reference ref="fee" />
    43164325                <text key="operator" text="Operator" />
    43174326                <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" />
    … …  
    43764385                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:internet_access" />
    43774386            <space />
    4378             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" match="key" />
    4379             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" match="key" />
     4387            <reference ref="internet" />
    43804388        </item> <!-- Internet Access -->
    43814389        <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
    … …  
    69456953            <reference ref="oh" />
    69466954            <reference ref="general_access" />
    6947             <combo key="fee" text="Fee" values="yes,no" />
     6955            <reference ref="fee" />
    69486956        </item> <!-- Cave Entrance -->
    69496957        <separator/>

  • trunk/data/validator/deprecated.mapcss

    r7600 r7620  
    302302}
    303303
     304/* See #10530 - Incorrect tag proposed in internal preset for years */
     305*[fee=interval] {
     306  throwWarning: tr("{0} is deprecated. Please specify ìnterval by using opening_hours syntax", "{0.tag}");
     307}
     308
    304309/* See #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */
    305310*[/josm\/ignore/] {
Note: See TracChangeset for help on using the changeset viewer.