Changeset 8411 in josm for trunk/data
- Timestamp:
- 2015-05-21T21:29:19+02:00 (9 years ago)
- Location:
- trunk/data
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/defaultpresets.xml
r8410 r8411 4549 4549 </optional> 4550 4550 </item> <!-- Clock --> 4551 <item name="Recycling " icon="presets/recycling.png" type="node,closedway" preset_name_label="true">4551 <item name="Recycling Container" icon="styles/standard/service/recycling/recycling_container.svg" type="node,closedway" preset_name_label="true"> 4552 4552 <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling" 4553 4553 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=recycling" … … 4563 4563 <space /> 4564 4564 <key key="amenity" value="recycling" /> 4565 <check key="recycling:batteries" text="Batteries" /> 4566 <check key="recycling:cans" text="Cans" /> 4567 <check key="recycling:clothes" text="Clothes" /> 4568 <check key="recycling:glass" text="Glass" /> 4569 <check key="recycling:paper" text="Paper" /> 4570 <check key="recycling:scrap_metal" text="Scrap Metal" /> 4571 <combo key="recycling_type" text="Type" values="container,centre" /> 4572 </item> <!-- Recycling --> 4565 <key key="recycling_type" value="container" /> 4566 <reference ref="oh_wheelchair" /> 4567 <space /> 4568 <checkgroup columns="4"> 4569 <check key="recycling:batteries" text="Batteries" /> 4570 <check key="recycling:cans" text="Cans" /> 4571 <check key="recycling:cardboard" text="Cardboard" /> 4572 <check key="recycling:clothes" text="Clothes" /> 4573 <check key="recycling:electrical_appliances" text="Electrical Appliances" /> 4574 <check key="recycling:glass" text="Glass" /> 4575 <check key="recycling:glass_bottles" text="Glass Bottles" /> 4576 <check key="recycling:green_waste" text="Green Waste" /> 4577 <check key="recycling:paper" text="Paper" /> 4578 <check key="recycling:plastic" text="Plastic" /> 4579 <check key="recycling:plastic_bottles" text="Plastic Bottles" /> 4580 <check key="recycling:plastic_packaging" text="Plastic Packaging" /> 4581 <check key="recycling:scrap_metal" text="Scrap Metal" /> 4582 <check key="recycling:shoes" text="Shoes" /> 4583 <check key="recycling:small_appliances" text="Small Appliances" /> 4584 <check key="recycling:waste" text="Waste" /> 4585 </checkgroup> 4586 </item> <!-- Recycling Container--> 4587 <item name="Recycling Centre" icon="styles/standard/service/recycling/recycling_centre.svg" type="node,closedway" preset_name_label="true"> 4588 <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling" 4589 de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=recycling" 4590 es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=recycling" 4591 fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" 4592 fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=recycling" 4593 it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=recycling" 4594 ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=recycling" 4595 pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=recycling" 4596 pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=recycling" 4597 ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=recycling" 4598 sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=recycling" /> 4599 <space /> 4600 <key key="amenity" value="recycling" /> 4601 <key key="recycling_type" value="centre" /> 4602 <reference ref="name_operator_oh_wheelchair" /> 4603 <space /> 4604 <checkgroup columns="4"> 4605 <check key="recycling:batteries" text="Batteries" /> 4606 <check key="recycling:cans" text="Cans" /> 4607 <check key="recycling:cardboard" text="Cardboard" /> 4608 <check key="recycling:clothes" text="Clothes" /> 4609 <check key="recycling:electrical_appliances" text="Electrical Appliances" /> 4610 <check key="recycling:glass" text="Glass" /> 4611 <check key="recycling:glass_bottles" text="Glass Bottles" /> 4612 <check key="recycling:green_waste" text="Green Waste" /> 4613 <check key="recycling:paper" text="Paper" /> 4614 <check key="recycling:plastic" text="Plastic" /> 4615 <check key="recycling:plastic_bottles" text="Plastic Bottles" /> 4616 <check key="recycling:plastic_packaging" text="Plastic Packaging" /> 4617 <check key="recycling:scrap_metal" text="Scrap Metal" /> 4618 <check key="recycling:shoes" text="Shoes" /> 4619 <check key="recycling:small_appliances" text="Small Appliances" /> 4620 <check key="recycling:waste" text="Waste" /> 4621 </checkgroup> 4622 <reference ref="link_contact_address_payment" /> 4623 </item> <!-- Recycling Centre--> 4573 4624 <item name="Waste Basket/Trash Can" icon="styles/standard/service/recycling/trash-bin.png" type="node" preset_name_label="true"> 4574 4625 <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket" -
trunk/data/validator/combinations.mapcss
r8383 r8411 138 138 } 139 139 140 /* {0.tag} without {1.tag} or {2.tag} */ 141 *[amenity=recycling][recycling_type!=container][recycling_type!=centre] { 142 throwWarning: tr("{0} without {1} or {2}", "{0.tag}", "{1.tag}", "{2.tag}"); 143 } 144 140 145 /* {0.key} without {1.key}, {2.tag} or {3.tag} */ 141 146 *[intermittent ][!waterway][natural!~/^(water|spring)$/][ford!=yes] {
Note:
See TracChangeset
for help on using the changeset viewer.