Ticket #10530: josm_10530.diff

File josm_10530.diff, 16.6 KB (added by skyper, 12 years ago)

patch

  • data/defaultpresets.xml

     
    281281        <text key="brand" text="Brand" />
    282282        <reference ref="oh" />
    283283    </chunk>
    284     <chunk id="internet_smoking_wheelchair">
     284    <chunk id="internet">
    285285        <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    286286        <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     287    </chunk>
     288    <chunk id="internet_smoking_wheelchair">
     289        <reference ref="internet" />
    287290        <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    288291        <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    289292    </chunk>
    … …  
    323326        <reference ref="payment_base" />
    324327        <check key="payment:account_cards" text="Account or loyalty cards" />
    325328    </chunk>
     329    <chunk id="fee">
     330        <combo key="fee" text="Fee" values="yes,no" />
     331    </chunk>
     332    <chunk id="fee_interval">
     333        <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|Mai-Sep 09:30-12:30,14:15-19:30" />
     334    </chunk>
    326335    <chunk id="parking_name_type_ref">
    327336        <text key="name" text="Name" />
    328337        <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
    … …  
    331340    <chunk id="parking_access_fee_operator_surface">
    332341        <space />
    333342        <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
    334         <combo key="fee" text="Fee" values="yes,no,interval" />
     343        <reference ref="fee_interval" />
    335344        <text key="operator" text="Operator" />
    336345        <reference ref="surface" />
    337         <space />
    338346    </chunk>
    339347    <chunk id="maxstay">
    340348        <combo key="maxstay" text="Time Limit (minutes)" values="0,30,60,90,120,180" />
    341349    </chunk>
    342350    <chunk id="supervised_lit_oh">
    343         <combo key="supervised" text="Supervised" values="yes,no,interval" />
    344         <combo key="lit" text="Lit" values="yes,no,interval" />
     351        <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|Mai-Sep 09:30-12:30,14:15-19:30" />
     352        <combo key="lit" text="Lit" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|Mai-Sep 09:30-12:30,14:15-19:30" />
    345353        <reference ref="oh" />
    346354    </chunk>
    347355    <chunk id="general_access">
    … …  
    11831191            <optional text="Optional crossing attributes:">
    11841192                <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    11851193                <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
    1186                 <check key="supervised" text="Crossing attendant" />
     1194                <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|Mai-Sep 09:30-12:30,14:15-19:30" />
    11871195                <check key="bicycle" text="Cross by bicycle" />
    11881196                <check key="horse" text="Cross on horseback" />
    11891197            </optional>
    … …  
    12311239            <key key="highway" value="crossing" />
    12321240            <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    12331241            <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
    1234             <check key="supervised" text="Crossing attendant" />
     1242            <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|Mai-Sep 09:30-12:30,14:15-19:30" />
    12351243            <check key="bicycle" text="Cross by bicycle" />
    12361244            <check key="horse" text="Cross on horseback" />
    12371245        </item> <!-- Pedestrian Crossing -->
    … …  
    19841992            <key key="natural" value="beach" />
    19851993            <reference ref="name_wikipedia" />
    19861994            <optional>
    1987                 <combo key="supervised" text="Supervised" values="yes,no,interval" />
     1995                <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|Mai-Sep 09:30-12:30,14:15-19:30" />
    19881996                <reference ref="oh" />
    19891997                <reference ref="general_access" />
    19901998                <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
    … …  
    22412249                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=level_crossing" />
    22422250            <key key="railway" value="level_crossing" />
    22432251            <optional>
    2244                 <check key="supervised" text="Supervised" />
     2252                <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|Mai-Sep 09:30-12:30,14:15-19:30" />
    22452253                <check key="crossing:light" text="Traffic lights" />
    22462254                <check key="crossing:bell" text="Sound signals" />
    22472255                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
    … …  
    22582266            <key key="railway" value="crossing" />
    22592267            <optional>
    22602268                <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
     2269                <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|Mai-Sep 09:30-12:30,14:15-19:30" />
    22612270                <check key="horse" text="Cross on horseback" />
    22622271                <check key="bicycle" text="Cross by bicycle" />
    2263                 <check key="supervised" text="Supervised" />
    22642272                <check key="crossing:light" text="Traffic lights" />
    22652273                <check key="crossing:bell" text="Sound signals" />
    22662274                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
    … …  
    26342642                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=motorcycle_parking" />
    26352643            <space />
    26362644            <key key="amenity" value="motorcycle_parking" />
    2637             <text key="name" text="Name" />
     2645            <reference ref="parking_name_type_ref" />
    26382646            <text key="capacity" text="Capacity" />
    2639             <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
    2640             <combo key="fee" text="Fee" values="yes,no" />
     2647            <reference ref="parking_access_fee_operator_surface" />
     2648            <reference ref="supervised_lit_oh" />
     2649            <check key="covered" text="Covered (with roof)" />
    26412650        </item> <!-- Parking -->
    26422651        <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true">
    26432652            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
    … …  
    26822691            <text key="capacity" text="Capacity" />
    26832692            <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" />
    26842693            <check key="covered" text="Covered" />
    2685             <check key="supervised" text="Supervised" />
     2694            <reference ref="fee" />
     2695            <reference ref="supervised_lit_oh" />
    26862696        </item> <!-- Parking -->
    26872697        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway" preset_name_label="true">
    26882698            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
    … …  
    30933103            <space />
    30943104            <key key="aeroway" value="terminal" />
    30953105            <text key="name" text="Name" />
    3096             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3097             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     3106            <reference ref="internet" />
    30983107            <reference ref="link_contact" />
    30993108        </item> <!-- Terminal -->
    31003109        <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true">
    … …  
    32213230            <reference ref="internet_smoking_wheelchair" />
    32223231            <space />
    32233232            <text key="capacity" text="Number of places" />
    3224             <combo key="fee" text="Requires a fee" values="yes,no,interval" />
     3233            <reference ref="fee_interval" />
    32253234            <check key="power_supply" text="Power supply" />
    32263235            <check key="tents" text="Tents allowed" />
    32273236            <space />
    … …  
    34343443            <key key="tourism" value="information" />
    34353444            <key key="information" value="office" />
    34363445            <reference ref="name_oh" />
    3437             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3438             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     3446            <reference ref="internet" />
    34393447            <reference ref="link_contact" />
    34403448        </item> <!-- Information Office -->
    34413449        <item name="Map" icon="presets/map.png" type="node" preset_name_label="true">
    … …  
    35133521            <reference ref="name_operator" />
    35143522            <text key="description" text="Closer description" />
    35153523            <text key="ref" text="Reference number" />
    3516             <combo key="fee" text="Fee" values="yes,no" />
    3517             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3518             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     3524            <reference ref="fee" />
     3525            <reference ref="internet" />
    35193526        </item> <!-- Information Terminal -->
    35203527        <item name="Audio Guide" icon="presets/information.png" type="node" preset_name_label="true">
    35213528            <link href="http://wiki.openstreetmap.org/wiki/Key:information"
    … …  
    35313538            <reference ref="name_operator" />
    35323539            <text key="description" text="Closer description" />
    35333540            <text key="ref" text="Reference number" />
    3534             <combo key="fee" text="Fee" values="yes,no" />
     3541            <reference ref="fee" />
    35353542            <space />
    35363543            <label text="Audioguide via mobile phone?" />
    35373544            <text key="phone" text="Phone number" />
    … …  
    36393646            <space />
    36403647            <key key="leisure" value="horse_riding" />
    36413648            <reference ref="name_operator_oh" />
    3642             <text key="fee" text="Fee" />
     3649            <reference ref="fee" />
    36433650            <space />
    36443651            <reference ref="contact" />
    36453652        </item> <!-- Horse Riding -->
    … …  
    39903997            <label text="Community Centre" />
    39913998            <space />
    39923999            <key key="amenity" value="community_centre" />
    3993             <reference ref="name_operator" />
    3994             <reference ref="oh" />
     4000            <reference ref="name_operator_oh" />
    39954001        </item> <!-- Community Centre -->
    39964002        <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true">
    39974003            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
    … …  
    40274033                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=prison" />
    40284034            <space />
    40294035            <key key="amenity" value="prison" />
    4030             <text key="name" text="Name" />
     4036            <reference ref="name_operator" />
    40314037            <reference ref="link_contact" />
    40324038        </item> <!-- Prison -->
    40334039        <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation" preset_name_label="true">
    … …  
    40704076                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=post_office" />
    40714077            <space />
    40724078            <key key="amenity" value="post_office" />
    4073             <reference ref="name_operator" />
     4079            <reference ref="name_operator_oh" />
    40744080        </item> <!-- Post Office -->
    40754081    </group> <!-- Public Buildings -->
    40764082    <group name="Education" icon="presets/school.png">
    … …  
    40844090                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=kindergarten" />
    40854091            <space />
    40864092            <key key="amenity" value="kindergarten" />
    4087             <text key="name" text="Name" />
     4093            <reference ref="name_operator_oh" />
    40884094            <reference ref="link_contact" />
    40894095        </item> <!-- Kindergarten -->
    40904096        <item name="School" icon="presets/school.png" type="node,closedway,relation" preset_name_label="true">
    … …  
    41004106                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=school" />
    41014107            <space />
    41024108            <key key="amenity" value="school" />
    4103             <text key="name" text="Name" />
     4109            <reference ref="name_operator_oh" />
    41044110            <reference ref="link_contact" />
    41054111        </item> <!-- School -->
    41064112        <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation" preset_name_label="true">
    … …  
    41154121                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=university" />
    41164122            <space />
    41174123            <key key="amenity" value="university" />
    4118             <text key="name" text="Name" />
     4124            <reference ref="name_operator" />
    41194125            <reference ref="link_contact" />
    41204126        </item> <!-- University -->
    41214127        <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation" preset_name_label="true">
    … …  
    41274133                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=college" />
    41284134            <space />
    41294135            <key key="amenity" value="college" />
    4130             <text key="name" text="Name" />
     4136            <reference ref="name_operator" />
    41314137            <reference ref="link_contact" />
    41324138        </item> <!-- College -->
    41334139         <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway" preset_name_label="true">
    … …  
    41364142                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=driving_school" />
    41374143            <space />
    41384144            <key key="amenity" value="driving_school" />
    4139             <reference ref="name_operator" />
     4145            <reference ref="name_operator_oh" />
    41404146            <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" />
    41414147            <reference ref="link_contact" />
    41424148        </item> <!-- Driving School -->
    … …  
    41614167                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=clinic" />
    41624168            <space />
    41634169            <key key="amenity" value="clinic" />
    4164             <text key="name" text="Name" />
     4170            <reference ref="name_operator" />
    41654171            <reference ref="link_contact" />
    41664172        </item> <!-- Clinic -->
    41674173        <item name="Doctor's Office" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
    … …  
    43044310            <combo key="toilets:disposal" text="Type" values="flush,pitlatrine,chemical,bucket" />
    43054311            <optional>
    43064312                <text key="description" text="Description" />
    4307                 <combo key="fee" text="Fee" values="yes,no" />
     4313                <reference ref="fee" />
    43084314                <text key="operator" text="Operator" />
    43094315                <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" />
    43104316                <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
    … …  
    43544360                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:internet_access"
    43554361                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:internet_access" />
    43564362            <space />
    4357             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" match="key" />
    4358             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" match="key" />
     4363            <reference ref="internet" />
    43594364        </item> <!-- Internet Access -->
    43604365        <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
    43614366            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator"
    … …  
    69146919            <reference ref="name_wikipedia" />
    69156920            <reference ref="oh" />
    69166921            <reference ref="general_access" />
    6917             <combo key="fee" text="Fee" values="yes,no" />
     6922            <reference ref="fee" />
    69186923        </item> <!-- Cave Entrance -->
    69196924        <separator/>
    69206925        <item name="Island" icon="presets/island.png" type="node,closedway" preset_name_label="true">