Changeset 7490 in josm
- Timestamp:
- 2014-09-04T18:22:52+02:00 (10 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/defaultpresets.xml
r7465 r7490 433 433 </optional> 434 434 </chunk> 435 <chunk id="optional_bridge"> 436 <optional> 437 <text key="name" text="Name" /> 438 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" /> 439 <text key="maxspeed" text="Max. speed (km/h)" /> 440 <text key="maxweight" text="Max. weight (tonnes)" /> 441 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" /> 442 <text key="width" text="Width (meters)" /> 443 <check key="toll" text="Toll" /> 444 </optional> 445 </chunk> 435 446 <!-- Link chunks --> 436 447 <chunk id="link_contact"> … … 900 911 </optional> 901 912 </item> <!-- Roundabout --> 902 <item name="Bridge" icon="presets/bridge.png" type="way" preset_name_label="true">903 <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"904 de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"905 fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"906 fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge"907 it.href="http://wiki.openstreetmap.org/wiki/IT:Key:bridge"908 ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:bridge"909 pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:bridge"910 pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:bridge"911 ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:bridge"912 uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:bridge"913 zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Key:bridge" />914 <space />915 <combo key="bridge" text="Bridge" values="yes,aqueduct,cantilever,covered,low_water_crossing,movable,suspension,swing,trestle,viaduct" match="keyvalue" default="yes" />916 <optional>917 <text key="name" text="Name" />918 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" />919 <text key="maxspeed" text="Max. speed (km/h)" />920 <text key="maxweight" text="Max. weight (tonnes)" />921 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />922 <text key="width" text="Width (meters)" />923 <check key="toll" text="Toll" />924 </optional>925 </item> <!-- Bridge -->926 913 <item name="Ford" icon="presets/ford.png" type="node,way" preset_name_label="true"> 927 914 <link href="http://wiki.openstreetmap.org/wiki/Key:ford" … … 5318 5305 </item> <!-- Surveillance Camera --> 5319 5306 </group> <!-- Man Made --> 5307 <group name="Bridges" icon="presets/bridge.png"> 5308 <item name="Bridge" icon="presets/bridge.png" type="way,relation" preset_name_label="true"> 5309 <link href="http://wiki.openstreetmap.org/wiki/Key:bridge" 5310 de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge" 5311 fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge" 5312 fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" 5313 it.href="http://wiki.openstreetmap.org/wiki/IT:Key:bridge" 5314 ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:bridge" 5315 pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:bridge" 5316 pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:bridge" 5317 ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:bridge" 5318 uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:bridge" 5319 zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Key:bridge" /> 5320 <space /> 5321 <combo key="bridge" text="Bridge" values="yes,aqueduct,boardwalk,cantilever,covered,low_water_crossing,trestle,viaduct" match="keyvalue" default="yes" /> 5322 <combo key="bridge:structure" text="Structure" values="arch,beam,truss,floating,suspension,cable-stayed,simple-suspension,humpback" match="key" /> 5323 <reference ref="optional_bridge" /> 5324 </item> <!-- Bridge --> 5325 <item name="Movable Bridge" icon="presets/bridge_movable.png" type="way,relation" preset_name_label="true"> 5326 <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:movable" 5327 de.href="http://wiki.openstreetmap.org/wiki/Key:bridge:movable" /> 5328 <space /> 5329 <key key="bridge" value="movable" /> 5330 <combo key="bridge:movable" text="Type" values="bascule,drawbridge,lift,submersible,swing,transporter" match="key" /> 5331 <reference ref="optional_bridge" /> 5332 </item> <!-- Movable Bridge --> 5333 <item name="Bridge Support" icon="presets/bridge.png" type="node,closedway" preset_name_label="true"> 5334 <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:support" /> 5335 <space /> 5336 <combo key="bridge:support" text="Type" values="pier,abutment,lift_pier,pivot_pier" match="key" /> 5337 </item> <!-- Bridge Support --> 5338 </group> <!-- Bridges --> 5320 5339 <group name="Power" icon="presets/power.png"> 5321 5340 <item name="Power Plant" icon="icons/power_station.png" type="closedway,relation" preset_name_label="true"> -
trunk/data/validator/combinations.mapcss
r7488 r7490 46 46 *[have_riverbank ][!waterway], 47 47 *[border_type ][!boundary], 48 *[bridge:structure ][!bridge], 48 49 *[source:date ][!source], 49 50 *[source:name ][!name], … … 100 101 *[castle_type ][historic!=castle], 101 102 *[reservoir_type ][landuse!=reservoir][water!=reservoir], 103 *[bridge:movable ][bridge!=movable], 102 104 *[bunker_type ][military!=bunker] { 103 105 throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}"); -
trunk/data/validator/deprecated.mapcss
r7449 r7490 261 261 assertMatch: "way natural=land"; 262 262 } 263 264 /* see #10447 - https://wiki.openstreetmap.org/wiki/Proposed_features/Bridge_types#Deprecated_bridge_key_values */ 265 *[bridge=causeway] { 266 throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}"); 267 suggestAlternative: "ford=yes"; 268 suggestAlternative: "bridge=low_water_crossing"; 269 suggestAlternative: "embankment=yes"; 270 } 271 272 *[bridge=swing] { 273 throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}"); 274 suggestAlternative: "bridge:movable=swing"; 275 suggestAlternative: "bridge:structure=simple-suspension"; 276 } 277 278 *[bridge=suspension] { 279 throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}"); 280 fixAdd: "bridge=yes"; 281 fixAdd: "bridge:structure=suspension"; 282 }
Note:
See TracChangeset
for help on using the changeset viewer.