Changeset 10860 in josm
- Timestamp:
- 2016-08-20T16:26:15+02:00 (9 years ago)
- Location:
- trunk/data
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/defaultpresets.xml
r10854 r10860 2174 2174 <key key="landuse" value="basin" /> 2175 2175 <text key="name" text="Name" /> 2176 <combo key="basin" text="Type" values="retention,infiltration,detention" /> 2176 2177 </item> <!-- Basin --> 2177 2178 <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true"> … … 2185 2186 <key key="landuse" value="reservoir" /> 2186 2187 <text key="name" text="Name" /> 2188 <combo key="reservoir_type" text="Type" values="evaporator,sewage,tailings,water_storage" /> 2187 2189 </item> <!-- Reservoir --> 2188 2190 <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" /> 2213 2215 <text key="name" text="Name" /> 2214 <combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river" match="key" values_searchable="true" /> 2216 <combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river,lock,wastewater" match="key" values_searchable="true" /> 2215 2217 <check key="salt" text="Salt Water" disable_off="true" /> 2216 2218 <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" /> -
trunk/data/validator/deprecated.mapcss
r10798 r10860 279 279 } 280 280 281 /* see #10107, #10108, #10929 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */ 282 *[wood=deciduous], 281 /* see #10107, #10108, #10929, #13391 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */ 283 282 *[type=broad_leaved], 284 283 *[type=broad_leafed] { … … 319 318 fixRemove: "type"; 320 319 fixAdd: "leaf_cycle=deciduous"; 320 } 321 322 *[wood=deciduous] { 323 throwWarning: tr("{0} is deprecated", "{0.tag}"); 324 suggestAlternative: "leaf_type + leaf_cycle"; 321 325 } 322 326
Note:
See TracChangeset
for help on using the changeset viewer.