Changeset 16266 in josm for trunk


Ignore:
Timestamp:
2020-04-12T00:02:14+02:00 (4 years ago)
Author:
Klumbumbus
Message:

fix #19007 - Add recycling materials wood, beverage_cartons, paper_packaging, books, magazines, newspaper and sort all "topical".

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r16265 r16266  
    41504150            <space />
    41514151            <checkgroup columns="4">
    4152                 <check key="recycling:batteries" text="Batteries" />
    4153                 <check key="recycling:cans" text="Cans" />
     4152                <check key="recycling:paper" text="Paper" />
     4153                <check key="recycling:paper_packaging" text="Paper packaging" />
    41544154                <check key="recycling:cardboard" text="Cardboard" />
    4155                 <check key="recycling:clothes" text="Clothes" />
    4156                 <check key="recycling:electrical_appliances" text="Electrical Appliances" />
    4157                 <check key="recycling:glass" text="Glass" />
    4158                 <check key="recycling:glass_bottles" text="Glass Bottles" />
    4159                 <check key="recycling:green_waste" text="Green Waste" />
    4160                 <check key="recycling:paper" text="Paper" />
     4155                <check key="recycling:newspaper" text="Newspaper" />
     4156                <check key="recycling:magazines" text="Magazines" />
     4157                <check key="recycling:books" text="Books" />
    41614158                <check key="recycling:plastic" text="Plastic" />
    41624159                <check key="recycling:plastic_bottles" text="Plastic Bottles" />
    41634160                <check key="recycling:plastic_packaging" text="Plastic Packaging" />
     4161                <check key="recycling:beverage_cartons" text="Beverage cartons" />
     4162                <check key="recycling:glass" text="Glass" />
     4163                <check key="recycling:glass_bottles" text="Glass Bottles" />
     4164                <check key="recycling:cans" text="Cans" />
     4165                <check key="recycling:clothes" text="Clothes" />
     4166                <check key="recycling:shoes" text="Shoes" />
    41644167                <check key="recycling:scrap_metal" text="Scrap Metal" />
    4165                 <check key="recycling:shoes" text="Shoes" />
     4168                <check key="recycling:wood" text="Wood" />
     4169                <check key="recycling:green_waste" text="Green Waste" />
     4170                <check key="recycling:waste" text="Waste" />
     4171                <check key="recycling:batteries" text="Batteries" />
    41664172                <check key="recycling:small_appliances" text="Small Appliances" />
    4167                 <check key="recycling:waste" text="Waste" />
     4173                <check key="recycling:electrical_appliances" text="Electrical Appliances" />
    41684174            </checkgroup>
    41694175        </item> <!-- Recycling Container-->
    … …  
    41764182            <space />
    41774183            <checkgroup columns="4">
    4178                 <check key="recycling:batteries" text="Batteries" />
    4179                 <check key="recycling:cans" text="Cans" />
     4184                <check key="recycling:paper" text="Paper" />
     4185                <check key="recycling:paper_packaging" text="Paper packaging" />
    41804186                <check key="recycling:cardboard" text="Cardboard" />
    4181                 <check key="recycling:clothes" text="Clothes" />
    4182                 <check key="recycling:electrical_appliances" text="Electrical Appliances" />
    4183                 <check key="recycling:glass" text="Glass" />
    4184                 <check key="recycling:glass_bottles" text="Glass Bottles" />
    4185                 <check key="recycling:green_waste" text="Green Waste" />
    4186                 <check key="recycling:paper" text="Paper" />
     4187                <check key="recycling:newspaper" text="Newspaper" />
     4188                <check key="recycling:magazines" text="Magazines" />
     4189                <check key="recycling:books" text="Books" />
    41874190                <check key="recycling:plastic" text="Plastic" />
    41884191                <check key="recycling:plastic_bottles" text="Plastic Bottles" />
    41894192                <check key="recycling:plastic_packaging" text="Plastic Packaging" />
     4193                <check key="recycling:beverage_cartons" text="Beverage cartons" />
     4194                <check key="recycling:glass" text="Glass" />
     4195                <check key="recycling:glass_bottles" text="Glass Bottles" />
     4196                <check key="recycling:cans" text="Cans" />
     4197                <check key="recycling:clothes" text="Clothes" />
     4198                <check key="recycling:shoes" text="Shoes" />
    41904199                <check key="recycling:scrap_metal" text="Scrap Metal" />
    4191                 <check key="recycling:shoes" text="Shoes" />
     4200                <check key="recycling:wood" text="Wood" />
     4201                <check key="recycling:green_waste" text="Green Waste" />
     4202                <check key="recycling:waste" text="Waste" />
     4203                <check key="recycling:batteries" text="Batteries" />
    41924204                <check key="recycling:small_appliances" text="Small Appliances" />
    4193                 <check key="recycling:waste" text="Waste" />
     4205                <check key="recycling:electrical_appliances" text="Electrical Appliances" />
    41944206            </checkgroup>
    41954207            <reference ref="link_contact_address_payment" />
    … …  
    72087220            </optional>
    72097221        </item> <!-- Tree Row -->
    7210         <item name="Wood" icon="presets/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
     7222        <item name="Wood" icon="presets/landmark/forest.svg" type="closedway,multipolygon" name_context="natural" preset_name_label="true">
    72117223            <link wiki="Tag:natural=wood" />
    72127224            <label text="Woodland where timber production does not dominate use." />
Note: See TracChangeset for help on using the changeset viewer.