Changeset 7620 in josm for trunk/data
- Timestamp:
- 2014-10-14T01:27:10+02:00 (10 years ago)
- Location:
- trunk/data
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/defaultpresets.xml
r7613 r7620 284 284 <reference ref="oh" /> 285 285 </chunk> 286 <chunk id="internet _smoking_wheelchair">286 <chunk id="internet"> 287 287 <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" /> 288 288 <combo key="internet_access:fee" text="Internet access fee" values="yes,no" /> 289 </chunk> 290 <chunk id="internet_smoking_wheelchair"> 291 <reference ref="internet" /> 289 292 <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" /> 290 293 <combo key="wheelchair" text="Wheelchairs" values="yes,no" /> … … 326 329 <check key="payment:account_cards" text="Account or loyalty cards" /> 327 330 </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> 328 337 <chunk id="parking_name_type_ref"> 329 338 <text key="name" text="Name" /> … … 334 343 <space /> 335 344 <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" /> 337 346 <text key="operator" text="Operator" /> 338 347 <reference ref="surface" /> 339 <space />340 348 </chunk> 341 349 <chunk id="maxstay"> 342 350 <combo key="maxstay" text="Time Limit (minutes)" values="0,30,60,90,120,180" /> 343 351 </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> 344 355 <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" /> 347 358 <reference ref="oh" /> 348 359 </chunk> … … 1186 1197 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" /> 1187 1198 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" /> 1188 <c heck 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" /> 1189 1200 <check key="bicycle" text="Cross by bicycle" /> 1190 1201 <check key="horse" text="Cross on horseback" /> … … 1234 1245 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" /> 1235 1246 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" /> 1236 <c heck 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" /> 1237 1248 <check key="bicycle" text="Cross by bicycle" /> 1238 1249 <check key="horse" text="Cross on horseback" /> … … 1987 1998 <reference ref="name_wikipedia" /> 1988 1999 <optional> 1989 < combo key="supervised" text="Supervised" values="yes,no,interval" />2000 <reference ref="supervised" /> 1990 2001 <reference ref="oh" /> 1991 2002 <reference ref="general_access" /> … … 2244 2255 <key key="railway" value="level_crossing" /> 2245 2256 <optional> 2246 < check key="supervised" text="Supervised" />2257 <reference ref="supervised" /> 2247 2258 <check key="crossing:light" text="Traffic lights" /> 2248 2259 <check key="crossing:bell" text="Sound signals" /> … … 2261 2272 <optional> 2262 2273 <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" /> 2274 <reference ref="supervised" /> 2263 2275 <check key="horse" text="Cross on horseback" /> 2264 2276 <check key="bicycle" text="Cross by bicycle" /> 2265 <check key="supervised" text="Supervised" />2266 2277 <check key="crossing:light" text="Traffic lights" /> 2267 2278 <check key="crossing:bell" text="Sound signals" /> … … 2637 2648 <space /> 2638 2649 <key key="amenity" value="motorcycle_parking" /> 2639 < text key="name" text="Name" />2650 <reference ref="parking_name_type_ref" /> 2640 2651 <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)" /> 2643 2655 </item> <!-- Parking --> 2644 2656 <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true"> … … 2685 2697 <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" /> 2686 2698 <check key="covered" text="Covered" /> 2687 <check key="supervised" text="Supervised" /> 2699 <reference ref="fee_interval" /> 2700 <reference ref="supervised_lit_oh" /> 2688 2701 </item> <!-- Parking --> 2689 2702 <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway" preset_name_label="true"> … … 3096 3109 <key key="aeroway" value="terminal" /> 3097 3110 <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" /> 3100 3112 <reference ref="link_contact" /> 3101 3113 </item> <!-- Terminal --> … … 3224 3236 <space /> 3225 3237 <text key="capacity" text="Number of places" /> 3226 < combo key="fee" text="Requires a fee" values="yes,no,interval" />3238 <reference ref="fee_interval" /> 3227 3239 <check key="power_supply" text="Power supply" /> 3228 3240 <check key="tents" text="Tents allowed" /> … … 3437 3449 <key key="information" value="office" /> 3438 3450 <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" /> 3441 3452 <reference ref="link_contact" /> 3442 3453 </item> <!-- Information Office --> … … 3516 3527 <text key="description" text="Closer description" /> 3517 3528 <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" /> 3521 3531 </item> <!-- Information Terminal --> 3522 3532 <item name="Audio Guide" icon="presets/information.png" type="node" preset_name_label="true"> … … 3534 3544 <text key="description" text="Closer description" /> 3535 3545 <text key="ref" text="Reference number" /> 3536 < combo key="fee" text="Fee" values="yes,no" />3546 <reference ref="fee" /> 3537 3547 <space /> 3538 3548 <label text="Audioguide via mobile phone?" /> … … 3642 3652 <key key="leisure" value="horse_riding" /> 3643 3653 <reference ref="name_operator_oh" /> 3644 < text key="fee" text="Fee" />3654 <reference ref="fee" /> 3645 3655 <space /> 3646 3656 <reference ref="contact" /> … … 3999 4009 <space /> 4000 4010 <key key="amenity" value="community_centre" /> 4001 <reference ref="name_operator" /> 4002 <reference ref="oh" /> 4011 <reference ref="name_operator_oh" /> 4003 4012 </item> <!-- Community Centre --> 4004 4013 <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true"> … … 4036 4045 <space /> 4037 4046 <key key="amenity" value="prison" /> 4038 < text key="name" text="Name" />4047 <reference ref="name_operator" /> 4039 4048 <reference ref="link_contact" /> 4040 4049 </item> <!-- Prison --> … … 4079 4088 <space /> 4080 4089 <key key="amenity" value="post_office" /> 4081 <reference ref="name_operator " />4090 <reference ref="name_operator_oh" /> 4082 4091 </item> <!-- Post Office --> 4083 4092 </group> <!-- Public Buildings --> … … 4093 4102 <space /> 4094 4103 <key key="amenity" value="kindergarten" /> 4095 < text key="name" text="Name" />4104 <reference ref="name_operator_oh" /> 4096 4105 <reference ref="link_contact" /> 4097 4106 </item> <!-- Kindergarten --> … … 4109 4118 <space /> 4110 4119 <key key="amenity" value="school" /> 4111 < text key="name" text="Name" />4120 <reference ref="name_operator_oh" /> 4112 4121 <reference ref="link_contact" /> 4113 4122 </item> <!-- School --> … … 4124 4133 <space /> 4125 4134 <key key="amenity" value="university" /> 4126 < text key="name" text="Name" />4135 <reference ref="name_operator" /> 4127 4136 <reference ref="link_contact" /> 4128 4137 </item> <!-- University --> … … 4136 4145 <space /> 4137 4146 <key key="amenity" value="college" /> 4138 < text key="name" text="Name" />4147 <reference ref="name_operator" /> 4139 4148 <reference ref="link_contact" /> 4140 4149 </item> <!-- College --> … … 4145 4154 <space /> 4146 4155 <key key="amenity" value="driving_school" /> 4147 <reference ref="name_operator " />4156 <reference ref="name_operator_oh" /> 4148 4157 <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" /> 4149 4158 <reference ref="link_contact" /> … … 4170 4179 <space /> 4171 4180 <key key="amenity" value="clinic" /> 4172 < text key="name" text="Name" />4181 <reference ref="name_operator" /> 4173 4182 <reference ref="link_contact" /> 4174 4183 </item> <!-- Clinic --> … … 4313 4322 <optional> 4314 4323 <text key="description" text="Description" /> 4315 < combo key="fee" text="Fee" values="yes,no" />4324 <reference ref="fee" /> 4316 4325 <text key="operator" text="Operator" /> 4317 4326 <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" /> … … 4376 4385 ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:internet_access" /> 4377 4386 <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" /> 4380 4388 </item> <!-- Internet Access --> 4381 4389 <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true"> … … 6945 6953 <reference ref="oh" /> 6946 6954 <reference ref="general_access" /> 6947 < combo key="fee" text="Fee" values="yes,no" />6955 <reference ref="fee" /> 6948 6956 </item> <!-- Cave Entrance --> 6949 6957 <separator/> -
trunk/data/validator/deprecated.mapcss
r7600 r7620 302 302 } 303 303 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 304 309 /* See #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */ 305 310 *[/josm\/ignore/] {
Note:
See TracChangeset
for help on using the changeset viewer.