Ticket #10530: josm_10530v2.diff
| File josm_10530v2.diff, 16.4 KB (added by , 12 years ago) |
|---|
-
data/defaultpresets.xml
282 282 <text key="brand" text="Brand" /> 283 283 <reference ref="oh" /> 284 284 </chunk> 285 <chunk id="internet _smoking_wheelchair">285 <chunk id="internet"> 286 286 <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" /> 287 287 <combo key="internet_access:fee" text="Internet access fee" values="yes,no" /> 288 </chunk> 289 <chunk id="internet_smoking_wheelchair"> 290 <reference ref="internet" /> 288 291 <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" /> 289 292 <combo key="wheelchair" text="Wheelchairs" values="yes,no" /> 290 293 </chunk> … … 324 327 <reference ref="payment_base" /> 325 328 <check key="payment:account_cards" text="Account or loyalty cards" /> 326 329 </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> 327 336 <chunk id="parking_name_type_ref"> 328 337 <text key="name" text="Name" /> 329 338 <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" /> … … 332 341 <chunk id="parking_access_fee_operator_surface"> 333 342 <space /> 334 343 <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" /> 336 345 <text key="operator" text="Operator" /> 337 346 <reference ref="surface" /> 338 <space />339 347 </chunk> 340 348 <chunk id="maxstay"> 341 349 <combo key="maxstay" text="Time Limit (minutes)" values="0,30,60,90,120,180" /> 342 350 </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> 343 354 <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" /> 346 357 <reference ref="oh" /> 347 358 </chunk> 348 359 <chunk id="general_access"> … … 1184 1195 <optional text="Optional crossing attributes:"> 1185 1196 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" /> 1186 1197 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" /> 1187 <c heck 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" /> 1188 1199 <check key="bicycle" text="Cross by bicycle" /> 1189 1200 <check key="horse" text="Cross on horseback" /> 1190 1201 </optional> … … 1232 1243 <key key="highway" value="crossing" /> 1233 1244 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" /> 1234 1245 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" /> 1235 <c heck 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" /> 1236 1247 <check key="bicycle" text="Cross by bicycle" /> 1237 1248 <check key="horse" text="Cross on horseback" /> 1238 1249 </item> <!-- Pedestrian Crossing --> … … 1985 1996 <key key="natural" value="beach" /> 1986 1997 <reference ref="name_wikipedia" /> 1987 1998 <optional> 1988 < combo key="supervised" text="Supervised" values="yes,no,interval" />1999 <reference ref="supervised" /> 1989 2000 <reference ref="oh" /> 1990 2001 <reference ref="general_access" /> 1991 2002 <combo key="surface" text="Surface" values="gravel,pebblestone,sand" /> … … 2242 2253 ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=level_crossing" /> 2243 2254 <key key="railway" value="level_crossing" /> 2244 2255 <optional> 2245 < check key="supervised" text="Supervised" />2256 <reference ref="supervised" /> 2246 2257 <check key="crossing:light" text="Traffic lights" /> 2247 2258 <check key="crossing:bell" text="Sound signals" /> 2248 2259 <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" /> … … 2259 2270 <key key="railway" value="crossing" /> 2260 2271 <optional> 2261 2272 <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" /> 2273 <reference ref="supervised" /> 2262 2274 <check key="horse" text="Cross on horseback" /> 2263 2275 <check key="bicycle" text="Cross by bicycle" /> 2264 <check key="supervised" text="Supervised" />2265 2276 <check key="crossing:light" text="Traffic lights" /> 2266 2277 <check key="crossing:bell" text="Sound signals" /> 2267 2278 <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" /> … … 2635 2646 fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=motorcycle_parking" /> 2636 2647 <space /> 2637 2648 <key key="amenity" value="motorcycle_parking" /> 2638 < text key="name" text="Name" />2649 <reference ref="parking_name_type_ref" /> 2639 2650 <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)" /> 2642 2654 </item> <!-- Parking --> 2643 2655 <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true"> 2644 2656 <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle" … … 2683 2695 <text key="capacity" text="Capacity" /> 2684 2696 <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" /> 2685 2697 <check key="covered" text="Covered" /> 2686 <check key="supervised" text="Supervised" /> 2698 <reference ref="fee_interval" /> 2699 <reference ref="supervised_lit_oh" /> 2687 2700 </item> <!-- Parking --> 2688 2701 <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway" preset_name_label="true"> 2689 2702 <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle" … … 3094 3107 <space /> 3095 3108 <key key="aeroway" value="terminal" /> 3096 3109 <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" /> 3099 3111 <reference ref="link_contact" /> 3100 3112 </item> <!-- Terminal --> 3101 3113 <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true"> … … 3222 3234 <reference ref="internet_smoking_wheelchair" /> 3223 3235 <space /> 3224 3236 <text key="capacity" text="Number of places" /> 3225 < combo key="fee" text="Requires a fee" values="yes,no,interval" />3237 <reference ref="fee_interval" /> 3226 3238 <check key="power_supply" text="Power supply" /> 3227 3239 <check key="tents" text="Tents allowed" /> 3228 3240 <space /> … … 3435 3447 <key key="tourism" value="information" /> 3436 3448 <key key="information" value="office" /> 3437 3449 <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" /> 3440 3451 <reference ref="link_contact" /> 3441 3452 </item> <!-- Information Office --> 3442 3453 <item name="Map" icon="presets/map.png" type="node" preset_name_label="true"> … … 3514 3525 <reference ref="name_operator" /> 3515 3526 <text key="description" text="Closer description" /> 3516 3527 <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" /> 3520 3530 </item> <!-- Information Terminal --> 3521 3531 <item name="Audio Guide" icon="presets/information.png" type="node" preset_name_label="true"> 3522 3532 <link href="http://wiki.openstreetmap.org/wiki/Key:information" … … 3532 3542 <reference ref="name_operator" /> 3533 3543 <text key="description" text="Closer description" /> 3534 3544 <text key="ref" text="Reference number" /> 3535 < combo key="fee" text="Fee" values="yes,no" />3545 <reference ref="fee" /> 3536 3546 <space /> 3537 3547 <label text="Audioguide via mobile phone?" /> 3538 3548 <text key="phone" text="Phone number" /> … … 3640 3650 <space /> 3641 3651 <key key="leisure" value="horse_riding" /> 3642 3652 <reference ref="name_operator_oh" /> 3643 < text key="fee" text="Fee" />3653 <reference ref="fee" /> 3644 3654 <space /> 3645 3655 <reference ref="contact" /> 3646 3656 </item> <!-- Horse Riding --> … … 3997 4007 <label text="Community Centre" /> 3998 4008 <space /> 3999 4009 <key key="amenity" value="community_centre" /> 4000 <reference ref="name_operator" /> 4001 <reference ref="oh" /> 4010 <reference ref="name_operator_oh" /> 4002 4011 </item> <!-- Community Centre --> 4003 4012 <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true"> 4004 4013 <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" … … 4034 4043 ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=prison" /> 4035 4044 <space /> 4036 4045 <key key="amenity" value="prison" /> 4037 < text key="name" text="Name" />4046 <reference ref="name_operator" /> 4038 4047 <reference ref="link_contact" /> 4039 4048 </item> <!-- Prison --> 4040 4049 <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation" preset_name_label="true"> … … 4077 4086 uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=post_office" /> 4078 4087 <space /> 4079 4088 <key key="amenity" value="post_office" /> 4080 <reference ref="name_operator " />4089 <reference ref="name_operator_oh" /> 4081 4090 </item> <!-- Post Office --> 4082 4091 </group> <!-- Public Buildings --> 4083 4092 <group name="Education" icon="presets/school.png"> … … 4091 4100 ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=kindergarten" /> 4092 4101 <space /> 4093 4102 <key key="amenity" value="kindergarten" /> 4094 < text key="name" text="Name" />4103 <reference ref="name_operator_oh" /> 4095 4104 <reference ref="link_contact" /> 4096 4105 </item> <!-- Kindergarten --> 4097 4106 <item name="School" icon="presets/school.png" type="node,closedway,relation" preset_name_label="true"> … … 4107 4116 uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=school" /> 4108 4117 <space /> 4109 4118 <key key="amenity" value="school" /> 4110 < text key="name" text="Name" />4119 <reference ref="name_operator_oh" /> 4111 4120 <reference ref="link_contact" /> 4112 4121 </item> <!-- School --> 4113 4122 <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation" preset_name_label="true"> … … 4122 4131 uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=university" /> 4123 4132 <space /> 4124 4133 <key key="amenity" value="university" /> 4125 < text key="name" text="Name" />4134 <reference ref="name_operator" /> 4126 4135 <reference ref="link_contact" /> 4127 4136 </item> <!-- University --> 4128 4137 <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation" preset_name_label="true"> … … 4134 4143 ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=college" /> 4135 4144 <space /> 4136 4145 <key key="amenity" value="college" /> 4137 < text key="name" text="Name" />4146 <reference ref="name_operator" /> 4138 4147 <reference ref="link_contact" /> 4139 4148 </item> <!-- College --> 4140 4149 <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway" preset_name_label="true"> … … 4143 4152 ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=driving_school" /> 4144 4153 <space /> 4145 4154 <key key="amenity" value="driving_school" /> 4146 <reference ref="name_operator " />4155 <reference ref="name_operator_oh" /> 4147 4156 <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" /> 4148 4157 <reference ref="link_contact" /> 4149 4158 </item> <!-- Driving School --> … … 4168 4177 ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=clinic" /> 4169 4178 <space /> 4170 4179 <key key="amenity" value="clinic" /> 4171 < text key="name" text="Name" />4180 <reference ref="name_operator" /> 4172 4181 <reference ref="link_contact" /> 4173 4182 </item> <!-- Clinic --> 4174 4183 <item name="Doctor's Office" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true"> … … 4311 4320 <combo key="toilets:disposal" text="Type" values="flush,pitlatrine,chemical,bucket" /> 4312 4321 <optional> 4313 4322 <text key="description" text="Description" /> 4314 < combo key="fee" text="Fee" values="yes,no" />4323 <reference ref="fee" /> 4315 4324 <text key="operator" text="Operator" /> 4316 4325 <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" /> 4317 4326 <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" /> … … 4374 4383 pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:internet_access" 4375 4384 ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:internet_access" /> 4376 4385 <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" /> 4379 4387 </item> <!-- Internet Access --> 4380 4388 <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true"> 4381 4389 <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator" … … 6943 6951 <reference ref="name_wikipedia" /> 6944 6952 <reference ref="oh" /> 6945 6953 <reference ref="general_access" /> 6946 < combo key="fee" text="Fee" values="yes,no" />6954 <reference ref="fee" /> 6947 6955 </item> <!-- Cave Entrance --> 6948 6956 <separator/> 6949 6957 <item name="Island" icon="presets/island.png" type="node,closedway" preset_name_label="true">
