Ticket #10530: josm_10530v2.diff

File josm_10530v2.diff, 16.4 KB (added by skyper, 12 years ago)

patch version 2

  • data/defaultpresets.xml

     
    282282        <text key="brand" text="Brand" />
    283283        <reference ref="oh" />
    284284    </chunk>
    285     <chunk id="internet_smoking_wheelchair">
     285    <chunk id="internet">
    286286        <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    287287        <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     288    </chunk>
     289    <chunk id="internet_smoking_wheelchair">
     290        <reference ref="internet" />
    288291        <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    289292        <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    290293    </chunk>
    … …  
    324327        <reference ref="payment_base" />
    325328        <check key="payment:account_cards" text="Account or loyalty cards" />
    326329    </chunk>
     330    <chunk id="fee">
     331        <combo key="fee" text="Fee" values="yes,no" />
     332    </chunk>
     333    <chunk id="fee_interval">
     334        <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" />
     335    </chunk>
    327336    <chunk id="parking_name_type_ref">
    328337        <text key="name" text="Name" />
    329338        <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
    … …  
    332341    <chunk id="parking_access_fee_operator_surface">
    333342        <space />
    334343        <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
    335         <combo key="fee" text="Fee" values="yes,no,interval" />
     344        <reference ref="fee_interval" />
    336345        <text key="operator" text="Operator" />
    337346        <reference ref="surface" />
    338         <space />
    339347    </chunk>
    340348    <chunk id="maxstay">
    341349        <combo key="maxstay" text="Time Limit (minutes)" values="0,30,60,90,120,180" />
    342350    </chunk>
     351    <chunk id="supervised">
     352        <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" />
     353    </chunk>
    343354    <chunk id="supervised_lit_oh">
    344         <combo key="supervised" text="Supervised" values="yes,no,interval" />
    345         <combo key="lit" text="Lit" values="yes,no,interval" />
     355        <reference ref="supervised" />
     356        <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" />
    346357        <reference ref="oh" />
    347358    </chunk>
    348359    <chunk id="general_access">
    … …  
    11841195            <optional text="Optional crossing attributes:">
    11851196                <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    11861197                <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
    1187                 <check key="supervised" text="Crossing attendant" />
     1198                <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" />
    11881199                <check key="bicycle" text="Cross by bicycle" />
    11891200                <check key="horse" text="Cross on horseback" />
    11901201            </optional>
    … …  
    12321243            <key key="highway" value="crossing" />
    12331244            <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    12341245            <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
    1235             <check key="supervised" text="Crossing attendant" />
     1246            <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" />
    12361247            <check key="bicycle" text="Cross by bicycle" />
    12371248            <check key="horse" text="Cross on horseback" />
    12381249        </item> <!-- Pedestrian Crossing -->
    … …  
    19851996            <key key="natural" value="beach" />
    19861997            <reference ref="name_wikipedia" />
    19871998            <optional>
    1988                 <combo key="supervised" text="Supervised" values="yes,no,interval" />
     1999                <reference ref="supervised" />
    19892000                <reference ref="oh" />
    19902001                <reference ref="general_access" />
    19912002                <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
    … …  
    22422253                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=level_crossing" />
    22432254            <key key="railway" value="level_crossing" />
    22442255            <optional>
    2245                 <check key="supervised" text="Supervised" />
     2256                <reference ref="supervised" />
    22462257                <check key="crossing:light" text="Traffic lights" />
    22472258                <check key="crossing:bell" text="Sound signals" />
    22482259                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
    … …  
    22592270            <key key="railway" value="crossing" />
    22602271            <optional>
    22612272                <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
     2273                <reference ref="supervised" />
    22622274                <check key="horse" text="Cross on horseback" />
    22632275                <check key="bicycle" text="Cross by bicycle" />
    2264                 <check key="supervised" text="Supervised" />
    22652276                <check key="crossing:light" text="Traffic lights" />
    22662277                <check key="crossing:bell" text="Sound signals" />
    22672278                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
    … …  
    26352646                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=motorcycle_parking" />
    26362647            <space />
    26372648            <key key="amenity" value="motorcycle_parking" />
    2638             <text key="name" text="Name" />
     2649            <reference ref="parking_name_type_ref" />
    26392650            <text key="capacity" text="Capacity" />
    2640             <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
    2641             <combo key="fee" text="Fee" values="yes,no" />
     2651            <reference ref="parking_access_fee_operator_surface" />
     2652            <reference ref="supervised_lit_oh" />
     2653            <check key="covered" text="Covered (with roof)" />
    26422654        </item> <!-- Parking -->
    26432655        <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true">
    26442656            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
    … …  
    26832695            <text key="capacity" text="Capacity" />
    26842696            <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" />
    26852697            <check key="covered" text="Covered" />
    2686             <check key="supervised" text="Supervised" />
     2698            <reference ref="fee_interval" />
     2699            <reference ref="supervised_lit_oh" />
    26872700        </item> <!-- Parking -->
    26882701        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway" preset_name_label="true">
    26892702            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
    … …  
    30943107            <space />
    30953108            <key key="aeroway" value="terminal" />
    30963109            <text key="name" text="Name" />
    3097             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3098             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     3110            <reference ref="internet" />
    30993111            <reference ref="link_contact" />
    31003112        </item> <!-- Terminal -->
    31013113        <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true">
    … …  
    32223234            <reference ref="internet_smoking_wheelchair" />
    32233235            <space />
    32243236            <text key="capacity" text="Number of places" />
    3225             <combo key="fee" text="Requires a fee" values="yes,no,interval" />
     3237            <reference ref="fee_interval" />
    32263238            <check key="power_supply" text="Power supply" />
    32273239            <check key="tents" text="Tents allowed" />
    32283240            <space />
    … …  
    34353447            <key key="tourism" value="information" />
    34363448            <key key="information" value="office" />
    34373449            <reference ref="name_oh" />
    3438             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3439             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     3450            <reference ref="internet" />
    34403451            <reference ref="link_contact" />
    34413452        </item> <!-- Information Office -->
    34423453        <item name="Map" icon="presets/map.png" type="node" preset_name_label="true">
    … …  
    35143525            <reference ref="name_operator" />
    35153526            <text key="description" text="Closer description" />
    35163527            <text key="ref" text="Reference number" />
    3517             <combo key="fee" text="Fee" values="yes,no" />
    3518             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3519             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     3528            <reference ref="fee" />
     3529            <reference ref="internet" />
    35203530        </item> <!-- Information Terminal -->
    35213531        <item name="Audio Guide" icon="presets/information.png" type="node" preset_name_label="true">
    35223532            <link href="http://wiki.openstreetmap.org/wiki/Key:information"
    … …  
    35323542            <reference ref="name_operator" />
    35333543            <text key="description" text="Closer description" />
    35343544            <text key="ref" text="Reference number" />
    3535             <combo key="fee" text="Fee" values="yes,no" />
     3545            <reference ref="fee" />
    35363546            <space />
    35373547            <label text="Audioguide via mobile phone?" />
    35383548            <text key="phone" text="Phone number" />
    … …  
    36403650            <space />
    36413651            <key key="leisure" value="horse_riding" />
    36423652            <reference ref="name_operator_oh" />
    3643             <text key="fee" text="Fee" />
     3653            <reference ref="fee" />
    36443654            <space />
    36453655            <reference ref="contact" />
    36463656        </item> <!-- Horse Riding -->
    … …  
    39974007            <label text="Community Centre" />
    39984008            <space />
    39994009            <key key="amenity" value="community_centre" />
    4000             <reference ref="name_operator" />
    4001             <reference ref="oh" />
     4010            <reference ref="name_operator_oh" />
    40024011        </item> <!-- Community Centre -->
    40034012        <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true">
    40044013            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
    … …  
    40344043                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=prison" />
    40354044            <space />
    40364045            <key key="amenity" value="prison" />
    4037             <text key="name" text="Name" />
     4046            <reference ref="name_operator" />
    40384047            <reference ref="link_contact" />
    40394048        </item> <!-- Prison -->
    40404049        <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation" preset_name_label="true">
    … …  
    40774086                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=post_office" />
    40784087            <space />
    40794088            <key key="amenity" value="post_office" />
    4080             <reference ref="name_operator" />
     4089            <reference ref="name_operator_oh" />
    40814090        </item> <!-- Post Office -->
    40824091    </group> <!-- Public Buildings -->
    40834092    <group name="Education" icon="presets/school.png">
    … …  
    40914100                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=kindergarten" />
    40924101            <space />
    40934102            <key key="amenity" value="kindergarten" />
    4094             <text key="name" text="Name" />
     4103            <reference ref="name_operator_oh" />
    40954104            <reference ref="link_contact" />
    40964105        </item> <!-- Kindergarten -->
    40974106        <item name="School" icon="presets/school.png" type="node,closedway,relation" preset_name_label="true">
    … …  
    41074116                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=school" />
    41084117            <space />
    41094118            <key key="amenity" value="school" />
    4110             <text key="name" text="Name" />
     4119            <reference ref="name_operator_oh" />
    41114120            <reference ref="link_contact" />
    41124121        </item> <!-- School -->
    41134122        <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation" preset_name_label="true">
    … …  
    41224131                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=university" />
    41234132            <space />
    41244133            <key key="amenity" value="university" />
    4125             <text key="name" text="Name" />
     4134            <reference ref="name_operator" />
    41264135            <reference ref="link_contact" />
    41274136        </item> <!-- University -->
    41284137        <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation" preset_name_label="true">
    … …  
    41344143                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=college" />
    41354144            <space />
    41364145            <key key="amenity" value="college" />
    4137             <text key="name" text="Name" />
     4146            <reference ref="name_operator" />
    41384147            <reference ref="link_contact" />
    41394148        </item> <!-- College -->
    41404149         <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway" preset_name_label="true">
    … …  
    41434152                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=driving_school" />
    41444153            <space />
    41454154            <key key="amenity" value="driving_school" />
    4146             <reference ref="name_operator" />
     4155            <reference ref="name_operator_oh" />
    41474156            <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" />
    41484157            <reference ref="link_contact" />
    41494158        </item> <!-- Driving School -->
    … …  
    41684177                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=clinic" />
    41694178            <space />
    41704179            <key key="amenity" value="clinic" />
    4171             <text key="name" text="Name" />
     4180            <reference ref="name_operator" />
    41724181            <reference ref="link_contact" />
    41734182        </item> <!-- Clinic -->
    41744183        <item name="Doctor's Office" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
    … …  
    43114320            <combo key="toilets:disposal" text="Type" values="flush,pitlatrine,chemical,bucket" />
    43124321            <optional>
    43134322                <text key="description" text="Description" />
    4314                 <combo key="fee" text="Fee" values="yes,no" />
     4323                <reference ref="fee" />
    43154324                <text key="operator" text="Operator" />
    43164325                <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" />
    43174326                <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
    … …  
    43744383                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:internet_access"
    43754384                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:internet_access" />
    43764385            <space />
    4377             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" match="key" />
    4378             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" match="key" />
     4386            <reference ref="internet" />
    43794387        </item> <!-- Internet Access -->
    43804388        <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
    43814389            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator"
    … …  
    69436951            <reference ref="name_wikipedia" />
    69446952            <reference ref="oh" />
    69456953            <reference ref="general_access" />
    6946             <combo key="fee" text="Fee" values="yes,no" />
     6954            <reference ref="fee" />
    69476955        </item> <!-- Cave Entrance -->
    69486956        <separator/>
    69496957        <item name="Island" icon="presets/island.png" type="node,closedway" preset_name_label="true">