Changeset 7222 in josm
- Timestamp:
- 2014-06-08T16:13:54+02:00 (11 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/.classpath
r7212 r7222 14 14 <classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/> 15 15 <classpathentry kind="lib" path="test/lib/jfcunit.jar"/> 16 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_ 55"/>16 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_60"/> 17 17 <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/> 18 18 <classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.jar"/> -
trunk/data/defaultpresets.xml
r7210 r7222 355 355 <text key="description" text="Description"/> 356 356 </chunk> 357 <chunk id="leaf"> 358 <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" /> 359 <combo key="leaf_cycle" text="Cycle" values="deciduous,evergreen,semi_deciduous,semi_evergreen,mixed" /> 360 </chunk> 357 361 <!-- Link chunks --> 358 362 <chunk id="link_contact"> … … 6283 6287 <text key="species" text="Species" /> 6284 6288 <text key="taxon" text="Taxon" /> 6289 <reference ref="leaf" /> 6285 6290 </optional> 6286 6291 </item> … … 6294 6299 ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree_row" /> 6295 6300 <key key="natural" value="tree_row" /> 6301 <optional> 6302 <reference ref="leaf" /> 6303 </optional> 6296 6304 </item> 6297 6305 <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true"> … … 6305 6313 <key key="natural" value="wood" /> 6306 6314 <text key="name" text="Name" /> 6307 < combo key="wood" text="Type" values="coniferous,deciduous,mixed" />6315 <reference ref="leaf" /> 6308 6316 </item> 6309 6317 <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true"> … … 6318 6326 <key key="landuse" value="forest" /> 6319 6327 <text key="name" text="Name" /> 6320 < combo key="wood" text="Type" values="coniferous,deciduous,mixed" />6328 <reference ref="leaf" /> 6321 6329 </item> 6322 6330 <item name="Grassland" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true"> -
trunk/data/validator/deprecated.mapcss
r7197 r7222 217 217 } 218 218 219 /* see #10107, #10108 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */ 220 *[wood=deciduous], 221 *[type=broad_leaved], 222 *[type=broad_leafed] { 223 throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}"); 224 fixRemove: "{0.key}"; 225 fixAdd: "leaf_type=broadleaved"; 226 } 227 228 *[wood=coniferous] { 229 throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}"); 230 fixRemove: "wood"; 231 fixAdd: "leaf_type=needleleaved"; 232 } 233 234 *[wood=mixed] { 235 throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}"); 236 fixRemove: "wood"; 237 fixAdd: "leaf_type=mixed"; 238 } 239 240 *[wood=evergreen], 241 *[type=evergreen] { 242 throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}"); 243 fixRemove: "{0.key}"; 244 fixAdd: "leaf_cycle=evergreen"; 245 } 246 247 *[type=deciduous], 248 *[type=deciduos] { 249 throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}"); 250 fixRemove: "type"; 251 fixAdd: "leaf_cycle=deciduous"; 252 }
Note:
See TracChangeset
for help on using the changeset viewer.