Changeset 10860 in josm

Timestamp:

2016-08-20T16:26:15+02:00 (9 years ago)

Author:

Klumbumbus

Message:

fix #13194 - update water, basin and reservoir presets; fix #13391 - remove autofix for wood=deciduous

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (3 diffs)
• validator/deprecated.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -2174 +2174 @@
             <key key="landuse" value="basin" />
             <text key="name" text="Name" />
+            <combo key="basin" text="Type" values="retention,infiltration,detention" />
         </item> <!-- Basin -->
         <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -2185 +2186 @@
             <key key="landuse" value="reservoir" />
             <text key="name" text="Name" />
+            <combo key="reservoir_type" text="Type" values="evaporator,sewage,tailings,water_storage" />
         </item> <!-- Reservoir -->
         <item name="Covered Reservoir" icon="presets/landmark/reservoir_covered.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -2212 +2214 @@
             <key key="natural" value="water" />
             <text key="name" text="Name" />
-            <combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river" match="key" values_searchable="true" />
+            <combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river,lock,wastewater" match="key" values_searchable="true" />
             <check key="salt" text="Salt Water" disable_off="true" />
             <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />

trunk/data/validator/deprecated.mapcss

@@ -279 +279 @@
 }
 
-/* see #10107, #10108, #10929 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
-*[wood=deciduous],
+/* see #10107, #10108, #10929, #13391 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
 *[type=broad_leaved],
 *[type=broad_leafed] {
@@ -319 +318 @@
   fixRemove: "type";
   fixAdd: "leaf_cycle=deciduous";
+}
+
+*[wood=deciduous] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leaf_type + leaf_cycle";
 }