Changeset 674 in josm
- Timestamp:
- 2008-07-02T23:40:17+02:00 (16 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 5 edited
-
images/dialogs/deleteselected.png (added)
-
presets/presets.xml (modified) (244 diffs)
-
src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (2 diffs)
-
src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) (7 diffs)
-
src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (modified) (4 diffs)
-
src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/presets/presets.xml
r673 r674 13 13 <label text=" " /> 14 14 <key key="highway" value="motorway" /> 15 <text key="ref" text="Reference :" default="" delete_if_empty="true" />16 <label text=" " /> 17 <label text="Optional Attributes:" /> 18 <label text=" " /> 19 <text key="name" text="Name :" default="" delete_if_empty="true" />20 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />21 <combo key="lanes" text="Lanes :" values="1,2,3,4,5" default="2" delete_if_empty="true" />22 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />23 <check key="oneway" text="Oneway :" default="on" delete_if_empty="true" />24 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />25 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />26 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />27 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />15 <text key="ref" text="Reference" default="" delete_if_empty="true" /> 16 <label text=" " /> 17 <label text="Optional Attributes:" /> 18 <label text=" " /> 19 <text key="name" text="Name" default="" delete_if_empty="true" /> 20 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 21 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" delete_if_empty="true" /> 22 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 23 <check key="oneway" text="Oneway" default="on" delete_if_empty="true" /> 24 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 25 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 26 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 27 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 28 28 </item> 29 29 … … 35 35 <label text="Optional Attributes:" /> 36 36 <label text=" " /> 37 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />38 <combo key="lanes" text="Lanes :" values="1,2,3,4,5" default="2" delete_if_empty="true" />39 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />40 <check key="oneway" text="Oneway :" default="on" delete_if_empty="true" />41 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />42 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />43 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />44 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />37 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 38 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" delete_if_empty="true" /> 39 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 40 <check key="oneway" text="Oneway" default="on" delete_if_empty="true" /> 41 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 42 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 43 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 44 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 45 45 </item> 46 46 … … 49 49 <label text=" " /> 50 50 <key key="highway" value="trunk" /> 51 <text key="ref" text="Reference :" default="" delete_if_empty="true" />52 <label text=" " /> 53 <label text="Optional Attributes:" /> 54 <label text=" " /> 55 <text key="name" text="Name :" default="" delete_if_empty="true" />56 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />57 <combo key="lanes" text="Lanes :" values="1,2,3,4,5" default="2" delete_if_empty="true" />58 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />59 <check key="oneway" text="Oneway :" default="on" delete_if_empty="true" />60 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />61 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />62 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />63 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />51 <text key="ref" text="Reference" default="" delete_if_empty="true" /> 52 <label text=" " /> 53 <label text="Optional Attributes:" /> 54 <label text=" " /> 55 <text key="name" text="Name" default="" delete_if_empty="true" /> 56 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 57 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" delete_if_empty="true" /> 58 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 59 <check key="oneway" text="Oneway" default="on" delete_if_empty="true" /> 60 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 61 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 62 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 63 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 64 64 </item> 65 65 … … 68 68 <label text=" " /> 69 69 <key key="highway" value="trunk_link" /> 70 <text key="ref" text="Reference :" default="" delete_if_empty="true" />71 <label text=" " /> 72 <label text="Optional Attributes:" /> 73 <label text=" " /> 74 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />75 <combo key="lanes" text="Lanes :" values="1,2,3,4,5" default="2" delete_if_empty="true" />76 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />77 <check key="oneway" text="Oneway :" default="on" delete_if_empty="true" />78 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />79 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />80 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />81 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />70 <text key="ref" text="Reference" default="" delete_if_empty="true" /> 71 <label text=" " /> 72 <label text="Optional Attributes:" /> 73 <label text=" " /> 74 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 75 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" delete_if_empty="true" /> 76 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 77 <check key="oneway" text="Oneway" default="on" delete_if_empty="true" /> 78 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 79 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 80 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 81 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 82 82 </item> 83 83 … … 87 87 <label text="Optional Attributes:" /> 88 88 <label text=" " /> 89 <text key="exit_nr" text="Exit Number :" default="" delete_if_empty="true" />90 <text key="exit_name" text="Exit Name :" default="" delete_if_empty="true" />89 <text key="exit_nr" text="Exit Number" default="" delete_if_empty="true" /> 90 <text key="exit_name" text="Exit Name" default="" delete_if_empty="true" /> 91 91 </item> 92 92 … … 97 97 <label text=" " /> 98 98 <key key="highway" value="primary" /> 99 <text key="ref" text="Reference :" default="" delete_if_empty="true" />100 <label text=" " /> 101 <label text="Optional Attributes:" /> 102 <label text=" " /> 103 <text key="name" text="Name :" default="" delete_if_empty="true" />104 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />105 <combo key="lanes" text="Lanes :" values="1,2,3,4,5" default="" delete_if_empty="true" />106 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />107 <check key="oneway" text="Oneway :" default="off" delete_if_empty="true" />108 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />109 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />110 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />111 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />99 <text key="ref" text="Reference" default="" delete_if_empty="true" /> 100 <label text=" " /> 101 <label text="Optional Attributes:" /> 102 <label text=" " /> 103 <text key="name" text="Name" default="" delete_if_empty="true" /> 104 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 105 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" /> 106 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 107 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 108 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 109 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 110 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 111 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 112 112 </item> 113 113 … … 119 119 <label text="Optional Attributes:" /> 120 120 <label text=" " /> 121 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />122 <combo key="lanes" text="Lanes :" values="1,2,3,4,5" default="" delete_if_empty="true" />123 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />124 <check key="oneway" text="Oneway :" default="off" delete_if_empty="true" />125 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />126 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />127 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />128 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />121 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 122 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" /> 123 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 124 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 125 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 126 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 127 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 128 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 129 129 </item> 130 130 … … 133 133 <label text=" " /> 134 134 <key key="highway" value="secondary" /> 135 <text key="ref" text="Reference :" default="" delete_if_empty="true" />136 <label text=" " /> 137 <label text="Optional Attributes:" /> 138 <label text=" " /> 139 <text key="name" text="Name :" default="" delete_if_empty="true" />140 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />141 <combo key="lanes" text="Lanes :" values="1,2,3,4,5" default="" delete_if_empty="true" />142 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />143 <check key="oneway" text="Oneway :" default="off" delete_if_empty="true" />144 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />145 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />146 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />147 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />135 <text key="ref" text="Reference" default="" delete_if_empty="true" /> 136 <label text=" " /> 137 <label text="Optional Attributes:" /> 138 <label text=" " /> 139 <text key="name" text="Name" default="" delete_if_empty="true" /> 140 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 141 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" /> 142 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 143 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 144 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 145 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 146 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 147 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 148 148 </item> 149 149 … … 152 152 <label text=" " /> 153 153 <key key="highway" value="tertiary" /> 154 <text key="ref" text="Reference :" default="" delete_if_empty="true" />155 <label text=" " /> 156 <label text="Optional Attributes:" /> 157 <label text=" " /> 158 <text key="name" text="Name :" default="" delete_if_empty="true" />159 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />160 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />161 <check key="oneway" text="Oneway :" default="off" delete_if_empty="true" />162 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />163 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />164 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />165 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />154 <text key="ref" text="Reference" default="" delete_if_empty="true" /> 155 <label text=" " /> 156 <label text="Optional Attributes:" /> 157 <label text=" " /> 158 <text key="name" text="Name" default="" delete_if_empty="true" /> 159 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 160 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 161 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 162 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 163 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 164 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 165 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 166 166 </item> 167 167 … … 173 173 <label text="Optional Attributes:" /> 174 174 <label text=" " /> 175 <text key="name" text="Name :" default="" delete_if_empty="true" />176 <check key="oneway" text="Oneway :" default="off" delete_if_empty="true" />177 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />178 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />179 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />180 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />181 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />182 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />183 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />175 <text key="name" text="Name" default="" delete_if_empty="true" /> 176 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 177 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 178 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 179 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 180 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 181 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 182 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 183 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 184 184 </item> 185 185 … … 192 192 <label text="Optional Attributes:" /> 193 193 <label text=" " /> 194 <text key="name" text="Name :" default="" delete_if_empty="true" />195 <check key="oneway" text="Oneway :" default="off" delete_if_empty="true" />196 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />197 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />198 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />199 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />200 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />201 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />202 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />194 <text key="name" text="Name" default="" delete_if_empty="true" /> 195 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 196 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 197 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 198 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 199 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 200 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 201 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 202 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 203 203 </item> 204 204 … … 207 207 <label text=" " /> 208 208 <key key="highway" value="residential" /> 209 <text key="name" text="Name :" default="" delete_if_empty="true" />210 <label text=" " /> 211 <label text="Optional Attributes:" /> 212 <label text=" " /> 213 <check key="oneway" text="Oneway :" default="off" delete_if_empty="true" />214 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />215 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />216 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />217 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />218 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />219 <combo key="surface" text="Surface :" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />220 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />209 <text key="name" text="Name" default="" delete_if_empty="true" /> 210 <label text=" " /> 211 <label text="Optional Attributes:" /> 212 <label text=" " /> 213 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 214 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 215 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 216 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 217 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 218 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 219 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" /> 220 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 221 221 </item> 222 222 … … 225 225 <label text=" " /> 226 226 <key key="highway" value="living_street" /> 227 <text key="name" text="Name :" default="" delete_if_empty="true" />228 <label text=" " /> 229 <label text="Optional Attributes:" /> 230 <label text=" " /> 231 <check key="oneway" text="Oneway :" default="off" delete_if_empty="true" />232 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />233 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />234 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />235 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />236 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />237 <combo key="surface" text="Surface :" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />238 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />227 <text key="name" text="Name" default="" delete_if_empty="true" /> 228 <label text=" " /> 229 <label text="Optional Attributes:" /> 230 <label text=" " /> 231 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 232 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 233 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 234 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 235 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 236 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 237 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" /> 238 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 239 239 </item> 240 240 … … 243 243 <label text=" " /> 244 244 <key key="highway" value="pedestrian" /> 245 <text key="name" text="Name :" default="" delete_if_empty="true" />246 <label text=" " /> 247 <label text="Optional Attributes:" /> 248 <label text=" " /> 249 <check key="oneway" text="Oneway :" default="off" delete_if_empty="true" />250 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />251 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />252 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />253 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />254 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />255 <combo key="surface" text="Surface :" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />256 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />245 <text key="name" text="Name" default="" delete_if_empty="true" /> 246 <label text=" " /> 247 <label text="Optional Attributes:" /> 248 <label text=" " /> 249 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 250 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 251 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 252 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 253 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 254 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 255 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" /> 256 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 257 257 </item> 258 258 … … 264 264 <check key="toll" text="Toll" default="off" delete_if_empty="true" /> 265 265 <check key="noexit" text="No exit (cul-de-sac)" default="off" delete_if_empty="true" /> 266 <combo key="access" text="Access :" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />267 <combo key="bicycle" text="Bicycle :" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />268 <combo key="foot" text="Foot :" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />269 <combo key="goods" text="Goods :" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />270 <combo key="hgv" text="Heavy Goods Vehicles (hgv) :" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />271 <combo key="horse" text="Horse :" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />272 <combo key="motorcycle" text="Motorcycle :" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />273 <combo key="motorcar" text="Motorcar :" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />274 <combo key="psv" text="Public Service Vehicles (psv) :" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />275 <combo key="motorboat" text="Motorboat :" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />276 <combo key="boat" text="Boat :" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />277 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />278 <text key="minspeed" text="Min. speed (km/h) :" default="" delete_if_empty="true" />279 <text key="maxweight" text="Max. weight (tonnes) :" default="" delete_if_empty="true" />280 <text key="maxheight" text="Max. Height (metres) :" default="" delete_if_empty="true" />281 <text key="maxwidth" text="Max. Width (metres) :" default="" delete_if_empty="true" />282 <text key="maxlength" text="Max. Length (metres) :" default="" delete_if_empty="true" />266 <combo key="access" text="Access" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" /> 267 <combo key="bicycle" text="Bicycle" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" /> 268 <combo key="foot" text="Foot" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" /> 269 <combo key="goods" text="Goods" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" /> 270 <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" /> 271 <combo key="horse" text="Horse" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" /> 272 <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" /> 273 <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" /> 274 <combo key="psv" text="Public Service Vehicles (psv)" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" /> 275 <combo key="motorboat" text="Motorboat" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" /> 276 <combo key="boat" text="Boat" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" /> 277 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 278 <text key="minspeed" text="Min. speed (km/h)" default="" delete_if_empty="true" /> 279 <text key="maxweight" text="Max. weight (tonnes)" default="" delete_if_empty="true" /> 280 <text key="maxheight" text="Max. Height (metres)" default="" delete_if_empty="true" /> 281 <text key="maxwidth" text="Max. Width (metres)" default="" delete_if_empty="true" /> 282 <text key="maxlength" text="Max. Length (metres)" default="" delete_if_empty="true" /> 283 283 </item> 284 284 … … 287 287 <label text=" " /> 288 288 <key key="junction" value="roundabout" /> 289 <combo key="highway" text="Type :" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" delete_if_empty="true" />290 <label text=" " /> 291 <label text="Optional Attributes:" /> 292 <label text=" " /> 293 <text key="name" text="Name :" default="" delete_if_empty="true" />294 <check key="oneway" text="Oneway :" default="on" delete_if_empty="true" />295 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />296 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />297 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />298 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />299 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />300 <combo key="lanes" text="Lanes :" values="1,2,3,4,5" default="" delete_if_empty="true" />301 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />289 <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" delete_if_empty="true" /> 290 <label text=" " /> 291 <label text="Optional Attributes:" /> 292 <label text=" " /> 293 <text key="name" text="Name" default="" delete_if_empty="true" /> 294 <check key="oneway" text="Oneway" default="on" delete_if_empty="true" /> 295 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 296 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 297 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 298 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 299 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 300 <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="" delete_if_empty="true" /> 301 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 302 302 </item> 303 303 … … 310 310 <label text="Optional Attributes:" /> 311 311 <label text=" " /> 312 <text key="name" text="Name :" default="" delete_if_empty="true" />313 <check key="oneway" text="Oneway :" default="off" delete_if_empty="true" />314 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />315 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />316 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />317 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />318 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />319 <combo key="surface" text="Surface :" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />320 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />321 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />312 <text key="name" text="Name" default="" delete_if_empty="true" /> 313 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 314 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 315 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 316 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 317 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 318 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 319 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" /> 320 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 321 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 322 322 </item> 323 323 … … 329 329 <label text="Optional Attributes:" /> 330 330 <label text=" " /> 331 <text key="name" text="Name :" default="" delete_if_empty="true" />331 <text key="name" text="Name" default="" delete_if_empty="true" /> 332 332 </item> 333 333 … … 339 339 <label text="Optional Attributes:" /> 340 340 <label text=" " /> 341 <text key="name" text="Name :" default="" delete_if_empty="true" />342 <check key="oneway" text="Oneway :" default="off" delete_if_empty="true" />343 <check key="bridge" text="Bridge :" default="off" delete_if_empty="true" />344 <check key="tunnel" text="Tunnel :" default="off" delete_if_empty="true" />345 <check key="cutting" text="Cutting :" default="off" delete_if_empty="true" />346 <check key="embankment" text="Embankment :" default="off" delete_if_empty="true" />347 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />348 <combo key="surface" text="Surface :" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />349 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />350 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />341 <text key="name" text="Name" default="" delete_if_empty="true" /> 342 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 343 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 344 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 345 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 346 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 347 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 348 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" /> 349 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 350 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 351 351 </item> 352 352 … … 358 358 <label text="Optional Attributes:" /> 359 359 <label text=" " /> 360 <text key="name" text="Name :" default="" delete_if_empty="true" />360 <text key="name" text="Name" default="" delete_if_empty="true" /> 361 361 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 362 362 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> … … 364 364 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 365 365 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 366 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />367 <combo key="surface" text="Surface :" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />368 <combo key="junction" text="Junction :" values="roundabout" default="" delete_if_empty="true" />369 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />370 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />366 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 367 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" /> 368 <combo key="junction" text="Junction" values="roundabout" default="" delete_if_empty="true" /> 369 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 370 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 371 371 </item> 372 372 … … 380 380 <label text="Optional Attributes:" /> 381 381 <label text=" " /> 382 <text key="name" text="Name :" default="" delete_if_empty="true" />382 <text key="name" text="Name" default="" delete_if_empty="true" /> 383 383 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 384 384 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> … … 386 386 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 387 387 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 388 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />389 <combo key="surface" text="Surface :" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />390 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />391 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />388 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 389 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" /> 390 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 391 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 392 392 </item> 393 393 … … 399 399 <label text="Optional Attributes:" /> 400 400 <label text=" " /> 401 <text key="name" text="Name :" default="" delete_if_empty="true" />401 <text key="name" text="Name" default="" delete_if_empty="true" /> 402 402 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 403 403 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> … … 405 405 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 406 406 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 407 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />408 <combo key="surface" text="Surface :" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />409 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />410 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />407 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 408 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" /> 409 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 410 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 411 411 </item> 412 412 … … 418 418 <label text="Optional Attributes:" /> 419 419 <label text=" " /> 420 <text key="name" text="Name :" default="" delete_if_empty="true" />420 <text key="name" text="Name" default="" delete_if_empty="true" /> 421 421 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 422 422 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> … … 424 424 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 425 425 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 426 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />427 <combo key="surface" text="Surface :" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />428 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />429 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />426 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 427 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" /> 428 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 429 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 430 430 </item> 431 431 … … 437 437 <label text="Optional Attributes:" /> 438 438 <label text=" " /> 439 <text key="name" text="Name :" default="" delete_if_empty="true" />439 <text key="name" text="Name" default="" delete_if_empty="true" /> 440 440 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 441 441 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> … … 443 443 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 444 444 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 445 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />446 <combo key="surface" text="Surface :" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />447 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />448 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />445 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 446 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" /> 447 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 448 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 449 449 </item> 450 450 … … 454 454 <key key="highway" value="path" /> 455 455 <label text=" " /> 456 <label text="Type :" />457 <combo key="motorcar" text="Motorcar :" values="yes,designated,no" default="" delete_if_empty="true" />458 <combo key="snowmobile" text="Snowmobile :" values="yes,designated,no" default="" delete_if_empty="true" />459 <combo key="horse" text="Horse :" values="yes,designated,no" default="" delete_if_empty="true" />460 <combo key="bicycle" text="Bicycle :" values="yes,designated,no" default="" delete_if_empty="true" />461 <combo key="ski" text="Ski :" values="yes,designated,no" default="" delete_if_empty="true" />462 <combo key="foot" text="Foot :" values="yes,designated,no" default="" delete_if_empty="true" />463 <label text=" " /> 464 <label text="Optional Attributes:" /> 465 <label text=" " /> 466 <text key="name" text="Name :" default="" delete_if_empty="true" />456 <label text="Type" /> 457 <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="" delete_if_empty="true" /> 458 <combo key="snowmobile" text="Snowmobile" values="yes,designated,no" default="" delete_if_empty="true" /> 459 <combo key="horse" text="Horse" values="yes,designated,no" default="" delete_if_empty="true" /> 460 <combo key="bicycle" text="Bicycle" values="yes,designated,no" default="" delete_if_empty="true" /> 461 <combo key="ski" text="Ski" values="yes,designated,no" default="" delete_if_empty="true" /> 462 <combo key="foot" text="Foot" values="yes,designated,no" default="" delete_if_empty="true" /> 463 <label text=" " /> 464 <label text="Optional Attributes:" /> 465 <label text=" " /> 466 <text key="name" text="Name" default="" delete_if_empty="true" /> 467 467 <check key="oneway" text="Oneway" default="off" delete_if_empty="true" /> 468 468 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> … … 470 470 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 471 471 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 472 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />473 <combo key="surface" text="Surface :" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />474 <text key="maxspeed" text="Max. speed (km/h) :" default="" delete_if_empty="true" />475 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />472 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 473 <combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" /> 474 <text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" /> 475 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 476 476 </item> 477 477 … … 481 481 <item name="Ways/Points" icon="presets/waypoints.png"> 482 482 <label text="Road Points" /> 483 <combo key="highway" text="Type :" values="motorway_junction,services,toll_booth,traffic_signals,crossing,mini_roundabout,incline,incline_steep,viaduct,stop,gate,bus_stop,stile,cattle_grid,ford,turning_circle" default="" />484 <text key="name" text="Name :" default="" delete_if_empty="true" />483 <combo key="highway" text="Type" values="motorway_junction,services,toll_booth,traffic_signals,crossing,mini_roundabout,incline,incline_steep,viaduct,stop,gate,bus_stop,stile,cattle_grid,ford,turning_circle" default="" /> 484 <text key="name" text="Name" default="" delete_if_empty="true" /> 485 485 <check key="mountain_pass" text="Mountain Pass" default="off" delete_if_empty="true" /> 486 486 </item> … … 495 495 <label text="Optional Attributes:" /> 496 496 <label text=" " /> 497 <text key="name" text="Name :" default="" delete_if_empty="true" />498 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 499 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 500 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 501 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 502 <combo key="surface" text="Surface :" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />503 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />504 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />497 <text key="name" text="Name" default="" delete_if_empty="true" /> 498 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 499 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 500 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 501 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 502 <combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" /> 503 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 504 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 505 505 </item> 506 506 … … 513 513 <label text="Optional Attributes:" /> 514 514 <label text=" " /> 515 <text key="name" text="Name :" default="" delete_if_empty="true" />516 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 517 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 518 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 519 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 520 <combo key="surface" text="Surface :" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />521 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />522 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />515 <text key="name" text="Name" default="" delete_if_empty="true" /> 516 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 517 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 518 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 519 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 520 <combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" /> 521 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 522 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 523 523 </item> 524 524 … … 531 531 <label text="Optional Attributes:" /> 532 532 <label text=" " /> 533 <text key="name" text="Name :" default="" delete_if_empty="true" />534 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 535 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 536 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 537 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 538 <combo key="surface" text="Surface :" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />539 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />540 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />533 <text key="name" text="Name" default="" delete_if_empty="true" /> 534 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 535 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 536 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 537 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 538 <combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" /> 539 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 540 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 541 541 </item> 542 542 … … 549 549 <label text="Optional Attributes:" /> 550 550 <label text=" " /> 551 <text key="name" text="Name :" default="" delete_if_empty="true" />552 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 553 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 554 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 555 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 556 <combo key="surface" text="Surface :" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />557 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />558 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />551 <text key="name" text="Name" default="" delete_if_empty="true" /> 552 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 553 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 554 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 555 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 556 <combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" /> 557 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 558 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 559 559 </item> 560 560 … … 567 567 <label text="Optional Attributes:" /> 568 568 <label text=" " /> 569 <text key="name" text="Name :" default="" delete_if_empty="true" />570 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 571 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 572 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 573 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 574 <combo key="surface" text="Surface :" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />575 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />576 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />569 <text key="name" text="Name" default="" delete_if_empty="true" /> 570 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 571 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 572 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 573 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 574 <combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" /> 575 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 576 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 577 577 </item> 578 578 … … 585 585 <label text="Optional Attributes:" /> 586 586 <label text=" " /> 587 <text key="name" text="Name :" default="" delete_if_empty="true" />588 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 589 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 590 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 591 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 592 <combo key="surface" text="Surface :" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" />593 <combo key="layer" text="Layer :" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />594 <text key="width" text="Width (metres) :" default="" delete_if_empty="true" />587 <text key="name" text="Name" default="" delete_if_empty="true" /> 588 <check key="bridge" text="Bridge" default="off" delete_if_empty="true" /> 589 <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" /> 590 <check key="cutting" text="Cutting" default="off" delete_if_empty="true" /> 591 <check key="embankment" text="Embankment" default="off" delete_if_empty="true" /> 592 <combo key="surface" text="Surface" values="copperstone,gravel,ground,grass,sand" default="" delete_if_empty="true" /> 593 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" /> 594 <text key="width" text="Width (metres)" default="" delete_if_empty="true" /> 595 595 </item> 596 596 … … 600 600 <label text=" " /> 601 601 <key key="railway" value="rail"/> 602 <combo key="service" text="Optional Types :" values="yard,siding,spur" default="" delete_if_empty="true" />602 <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" /> 603 603 </item> 604 604 … … 607 607 <label text=" " /> 608 608 <key key="railway" value="narrow_gauge"/> 609 <combo key="service" text="Optional Types :" values="yard,siding,spur" default="" delete_if_empty="true" />609 <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" /> 610 610 </item> 611 611 … … 614 614 <label text=" " /> 615 615 <key key="railway" value="monorail"/> 616 <combo key="service" text="Optional Types :" values="yard,siding,spur" default="" delete_if_empty="true" />616 <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" /> 617 617 </item> 618 618 … … 621 621 <label text=" " /> 622 622 <key key="railway" value="light_rail"/> 623 <combo key="service" text="Optional Types :" values="yard,siding,spur" default="" delete_if_empty="true" />623 <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" /> 624 624 </item> 625 625 … … 628 628 <label text=" " /> 629 629 <key key="railway" value="subway"/> 630 <combo key="service" text="Optional Types :" values="yard,siding,spur" default="" delete_if_empty="true" />630 <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" /> 631 631 </item> 632 632 … … 635 635 <label text=" " /> 636 636 <key key="railway" value="tram"/> 637 <combo key="service" text="Optional Types :" values="yard,siding,spur" default="" delete_if_empty="true" />637 <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" /> 638 638 </item> 639 639 … … 642 642 <label text=" " /> 643 643 <key key="railway" value="preserved"/> 644 <combo key="service" text="Optional Types :" values="yard,siding,spur" default="" delete_if_empty="true" />644 <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" /> 645 645 </item> 646 646 … … 649 649 <label text=" " /> 650 650 <key key="railway" value="disused"/> 651 <combo key="service" text="Optional Types :" values="yard,siding,spur" default="" delete_if_empty="true" />651 <combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" /> 652 652 </item> 653 653 … … 659 659 660 660 <item name="Railway/Railway Point" icon="presets/railwaypoint.png"> 661 <label text=" Railway Points" />662 <combo key="railway" text="Type :" values="station,halt,tram_stop,subway_entrance,crossing,level_crossing,turntable,viaduct" default="" delete_if_empty="true" />663 <text key="name" text="Name :" default="" delete_if_empty="true" />661 <label text="Edit a Railway Point" /> 662 <combo key="railway" text="Type" values="station,halt,tram_stop,subway_entrance,crossing,level_crossing,turntable,viaduct" default="" delete_if_empty="true" /> 663 <text key="name" text="Name" default="" delete_if_empty="true" /> 664 664 </item> 665 665 … … 669 669 <label text=" " /> 670 670 <key key="waterway" value="river" /> 671 <text key="name" text="Name :" default="" delete_if_empty="true" />671 <text key="name" text="Name" default="" delete_if_empty="true" /> 672 672 </item> 673 673 … … 676 676 <label text=" " /> 677 677 <key key="waterway" value="dock" /> 678 <text key="name" text="Name :" default="" delete_if_empty="true" />678 <text key="name" text="Name" default="" delete_if_empty="true" /> 679 679 </item> 680 680 … … 683 683 <label text=" " /> 684 684 <key key="waterway" value="canal" /> 685 <text key="name" text="Name :" default="" delete_if_empty="true" />685 <text key="name" text="Name" default="" delete_if_empty="true" /> 686 686 </item> 687 687 … … 690 690 <label text=" " /> 691 691 <key key="waterway" value="drain" /> 692 <text key="name" text="Name :" default="" delete_if_empty="true" />692 <text key="name" text="Name" default="" delete_if_empty="true" /> 693 693 </item> 694 694 … … 697 697 <label text=" " /> 698 698 <key key="waterway" value="stream" /> 699 <text key="name" text="Name :" default="" delete_if_empty="true" />699 <text key="name" text="Name" default="" delete_if_empty="true" /> 700 700 </item> 701 701 … … 706 706 <label text=" " /> 707 707 <key key="waterway" value="weir" /> 708 <text key="name" text="Name :" default="" delete_if_empty="true" />708 <text key="name" text="Name" default="" delete_if_empty="true" /> 709 709 </item> 710 710 … … 713 713 <label text=" " /> 714 714 <key key="waterway" value="dam" /> 715 <text key="name" text="Name :" default="" delete_if_empty="true" />715 <text key="name" text="Name" default="" delete_if_empty="true" /> 716 716 </item> 717 717 … … 719 719 <label text="Edit Waterway Points" /> 720 720 <label text=" " /> 721 <combo key="waterway" text="Type :" values="lock_gate,turning_point,aqueduct,boatyard,water_point,waste_disposal,mooring,weir" default="" delete_if_empty="true" />722 <text key="name" text="Name :" default="" delete_if_empty="true" />721 <combo key="waterway" text="Type" values="lock_gate,turning_point,aqueduct,boatyard,water_point,waste_disposal,mooring,weir" default="" delete_if_empty="true" /> 722 <text key="name" text="Name" default="" delete_if_empty="true" /> 723 723 </item> 724 724 … … 730 730 <label text="Edit Fuel" /> 731 731 <key key="amenity" value="fuel" /> 732 <text key="name" text="Name :" default="" delete_if_empty="true" />733 <text key="operator" text="Operator :" default="" delete_if_empty="true" />732 <text key="name" text="Name" default="" delete_if_empty="true" /> 733 <text key="operator" text="Operator" default="" delete_if_empty="true" /> 734 734 </item> 735 735 … … 737 737 <label text="Edit Parking" /> 738 738 <key key="amenity" value="parking" /> 739 <text key="name" text="Name :" default="" delete_if_empty="true" />739 <text key="name" text="Name" default="" delete_if_empty="true" /> 740 740 </item> 741 741 … … 743 743 <label text="Edit Car Rental" /> 744 744 <key key="amenity" value="car_rental" /> 745 <text key="name" text="Name :" default="" delete_if_empty="true" />746 <text key="operator" text="Operator :" default="" delete_if_empty="true" />745 <text key="name" text="Name" default="" delete_if_empty="true" /> 746 <text key="operator" text="Operator" default="" delete_if_empty="true" /> 747 747 </item> 748 748 … … 750 750 <label text="Edit Car Sharing" /> 751 751 <key key="amenity" value="car_sharing" /> 752 <text key="name" text="Name :" default="" delete_if_empty="true" />753 <text key="operator" text="Operator :" default="" delete_if_empty="true" />752 <text key="name" text="Name" default="" delete_if_empty="true" /> 753 <text key="operator" text="Operator" default="" delete_if_empty="true" /> 754 754 </item> 755 755 … … 760 760 <label text="Edit Bicycle Parking" /> 761 761 <key key="amenity" value="bicycle_parking" /> 762 <text key="name" text="Name :" default="" delete_if_empty="true" />762 <text key="name" text="Name" default="" delete_if_empty="true" /> 763 763 </item> 764 764 … … 766 766 <label text="Edit Bicycle Rental" /> 767 767 <key key="amenity" value="bicycle_rental" /> 768 <text key="name" text="Name :" default="" delete_if_empty="true" />768 <text key="name" text="Name" default="" delete_if_empty="true" /> 769 769 </item> 770 770 … … 772 772 <label text="Bicycle Shop" /> 773 773 <key key="shop" value="bicycle" /> 774 <text key="name" text="Name :" default="" delete_if_empty="true" />774 <text key="name" text="Name" default="" delete_if_empty="true" /> 775 775 </item> 776 776 … … 780 780 <label text="Edit Hotel" /> 781 781 <key key="tourism" value="hotel" /> 782 <text key="name" text="Name :" default="" delete_if_empty="true" />782 <text key="name" text="Name" default="" delete_if_empty="true" /> 783 783 </item> 784 784 … … 786 786 <label text="Edit Motel" /> 787 787 <key key="tourism" value="motel" /> 788 <text key="name" text="Name :" default="" delete_if_empty="true" />788 <text key="name" text="Name" default="" delete_if_empty="true" /> 789 789 </item> 790 790 … … 792 792 <label text="Edit Guest House" /> 793 793 <key key="tourism" value="guest_house" /> 794 <text key="name" text="Name :" default="" delete_if_empty="true" />794 <text key="name" text="Name" default="" delete_if_empty="true" /> 795 795 </item> 796 796 … … 798 798 <label text="Edit Hostel" /> 799 799 <key key="tourism" value="hostel" /> 800 <text key="name" text="Name :" default="" delete_if_empty="true" />800 <text key="name" text="Name" default="" delete_if_empty="true" /> 801 801 </item> 802 802 … … 804 804 <label text="Edit Caravan Site" /> 805 805 <key key="tourism" value="caravan_site" /> 806 <text key="name" text="Name :" default="" delete_if_empty="true" />806 <text key="name" text="Name" default="" delete_if_empty="true" /> 807 807 </item> 808 808 … … 810 810 <label text="Edit Camping Site" /> 811 811 <key key="tourism" value="camp_site" /> 812 <text key="name" text="Name :" default="" delete_if_empty="true" />812 <text key="name" text="Name" default="" delete_if_empty="true" /> 813 813 </item> 814 814 … … 816 816 <label text="Edit Restaurant" /> 817 817 <key key="amenity" value="restaurant" /> 818 <text key="name" text="Name :" default="" delete_if_empty="true" />818 <text key="name" text="Name" default="" delete_if_empty="true" /> 819 819 </item> 820 820 … … 822 822 <label text="Edit Biergarten" /> 823 823 <key key="amenity" value="biergarten" /> 824 <text key="name" text="Name :" default="" delete_if_empty="true" />824 <text key="name" text="Name" default="" delete_if_empty="true" /> 825 825 </item> 826 826 … … 828 828 <label text="Edit Fast Food Restaurant" /> 829 829 <key key="amenity" value="fast_food" /> 830 <text key="name" text="Name :" default="" delete_if_empty="true" />830 <text key="name" text="Name" default="" delete_if_empty="true" /> 831 831 </item> 832 832 … … 834 834 <label text="Edit Cafe" /> 835 835 <key key="amenity" value="cafe" /> 836 <text key="name" text="Name :" default="" delete_if_empty="true" />836 <text key="name" text="Name" default="" delete_if_empty="true" /> 837 837 </item> 838 838 … … 840 840 <label text="Edit Pub" /> 841 841 <key key="amenity" value="pub" /> 842 <text key="name" text="Name :" default="" delete_if_empty="true" />842 <text key="name" text="Name" default="" delete_if_empty="true" /> 843 843 </item> 844 844 … … 846 846 <label text="Edit Nightclub" /> 847 847 <key key="amenity" value="nightclub" /> 848 <text key="name" text="Name :" default="" delete_if_empty="true" />848 <text key="name" text="Name" default="" delete_if_empty="true" /> 849 849 </item> 850 850 … … 855 855 <label text="Edit Tourist Information" /> 856 856 <key key="tourism" value="information" /> 857 <text key="name" text="Name :" default="" delete_if_empty="true" />857 <text key="name" text="Name" default="" delete_if_empty="true" /> 858 858 </item> 859 859 … … 861 861 <label text="Edit Museum" /> 862 862 <key key="tourism" value="museum" /> 863 <text key="name" text="Name :" default="" delete_if_empty="true" />863 <text key="name" text="Name" default="" delete_if_empty="true" /> 864 864 </item> 865 865 … … 867 867 <label text="Edit Zoo" /> 868 868 <key key="tourism" value="zoo" /> 869 <text key="name" text="Name :" default="" delete_if_empty="true" />869 <text key="name" text="Name" default="" delete_if_empty="true" /> 870 870 </item> 871 871 … … 873 873 <label text="Edit Viewpoint" /> 874 874 <key key="tourism" value="viewpoint" /> 875 <text key="name" text="Name :" default="" delete_if_empty="true" />875 <text key="name" text="Name" default="" delete_if_empty="true" /> 876 876 </item> 877 877 … … 879 879 <label text="Edit Attraction" /> 880 880 <key key="tourism" value="attraction" /> 881 <text key="name" text="Name :" default="" delete_if_empty="true" />881 <text key="name" text="Name" default="" delete_if_empty="true" /> 882 882 </item> 883 883 … … 885 885 <label text="Edit Picnic Site" /> 886 886 <key key="tourism" value="picnic_site" /> 887 <text key="name" text="Name :" default="" delete_if_empty="true" />887 <text key="name" text="Name" default="" delete_if_empty="true" /> 888 888 </item> 889 889 … … 891 891 <label text="Edit Theme Park" /> 892 892 <key key="tourism" value="theme_park" /> 893 <text key="name" text="Name :" default="" delete_if_empty="true" />893 <text key="name" text="Name" default="" delete_if_empty="true" /> 894 894 </item> 895 895 … … 897 897 <label text="Edit Artwork" /> 898 898 <key key="tourism" value="artwork" /> 899 <text key="name" text="Name :" default="" delete_if_empty="true" />899 <text key="name" text="Name" default="" delete_if_empty="true" /> 900 900 </item> 901 901 … … 906 906 <label text="Edit Castle" /> 907 907 <key key="historic" value="castle" /> 908 <text key="name" text="Name :" default="" delete_if_empty="true" />908 <text key="name" text="Name" default="" delete_if_empty="true" /> 909 909 </item> 910 910 … … 912 912 <label text="Edit Ruins" /> 913 913 <key key="historic" value="ruins" /> 914 <text key="name" text="Name :" default="" delete_if_empty="true" />914 <text key="name" text="Name" default="" delete_if_empty="true" /> 915 915 </item> 916 916 … … 918 918 <label text="Edit Archaeological Site" /> 919 919 <key key="historic" value="archaeological_site" /> 920 <text key="name" text="Name :" default="" delete_if_empty="true" />920 <text key="name" text="Name" default="" delete_if_empty="true" /> 921 921 </item> 922 922 … … 924 924 <label text="Edit Monument" /> 925 925 <key key="historic" value="monument" /> 926 <text key="name" text="Name :" default="" delete_if_empty="true" />926 <text key="name" text="Name" default="" delete_if_empty="true" /> 927 927 </item> 928 928 … … 930 930 <label text="Edit Memorial" /> 931 931 <key key="historic" value="memorial" /> 932 <text key="name" text="Name :" default="" delete_if_empty="true" />932 <text key="name" text="Name" default="" delete_if_empty="true" /> 933 933 </item> 934 934 … … 936 936 <label text="Edit Battlefield" /> 937 937 <key key="historic" value="battlefield" /> 938 <text key="name" text="Name :" default="" delete_if_empty="true" />938 <text key="name" text="Name" default="" delete_if_empty="true" /> 939 939 </item> 940 940 … … 945 945 <label text="Edit Water Park" /> 946 946 <key key="leisure" value="water_park" /> 947 <text key="name" text="Name :" default="" delete_if_empty="true" />947 <text key="name" text="Name" default="" delete_if_empty="true" /> 948 948 </item> 949 949 … … 951 951 <label text="Edit Marina" /> 952 952 <key key="leisure" value="marina" /> 953 <text key="name" text="Name :" default="" delete_if_empty="true" />953 <text key="name" text="Name" default="" delete_if_empty="true" /> 954 954 </item> 955 955 … … 957 957 <label text="Edit Slipway" /> 958 958 <key key="leisure" value="slipway" /> 959 <text key="name" text="Name :" default="" delete_if_empty="true" />959 <text key="name" text="Name" default="" delete_if_empty="true" /> 960 960 </item> 961 961 … … 963 963 <label text="Edit Fishing" /> 964 964 <key key="leisure" value="fishing" /> 965 <text key="name" text="Name :" default="" delete_if_empty="true" />965 <text key="name" text="Name" default="" delete_if_empty="true" /> 966 966 </item> 967 967 … … 969 969 <label text="Edit Nature Reserve" /> 970 970 <key key="leisure" value="nature_reserve" /> 971 <text key="name" text="Name :" default="" delete_if_empty="true" />971 <text key="name" text="Name" default="" delete_if_empty="true" /> 972 972 </item> 973 973 … … 975 975 <label text="Edit Park" /> 976 976 <key key="leisure" value="park" /> 977 <text key="name" text="Name :" default="" delete_if_empty="true" />977 <text key="name" text="Name" default="" delete_if_empty="true" /> 978 978 </item> 979 979 … … 981 981 <label text="Edit Playground" /> 982 982 <key key="leisure" value="playground" /> 983 <text key="name" text="Name :" default="" delete_if_empty="true" />983 <text key="name" text="Name" default="" delete_if_empty="true" /> 984 984 </item> 985 985 … … 987 987 <label text="Edit Garden" /> 988 988 <key key="leisure" value="garden" /> 989 <text key="name" text="Name :" default="" delete_if_empty="true" />989 <text key="name" text="Name" default="" delete_if_empty="true" /> 990 990 </item> 991 991 … … 993 993 <label text="Edit Common" /> 994 994 <key key="leisure" value="common" /> 995 <text key="name" text="Name :" default="" delete_if_empty="true" />995 <text key="name" text="Name" default="" delete_if_empty="true" /> 996 996 </item> 997 997 … … 1001 1001 <label text="Edit Stadium" /> 1002 1002 <key key="leisure" value="stadium" /> 1003 <text key="name" text="Name :" default="" delete_if_empty="true" />1003 <text key="name" text="Name" default="" delete_if_empty="true" /> 1004 1004 </item> 1005 1005 … … 1007 1007 <label text="Edit Sports Centre" /> 1008 1008 <key key="leisure" value="sports_centre" /> 1009 <text key="name" text="Name :" default="" delete_if_empty="true" />1009 <text key="name" text="Name" default="" delete_if_empty="true" /> 1010 1010 </item> 1011 1011 … … 1013 1013 <label text="Edit Pitch" /> 1014 1014 <key key="leisure" value="pitch" /> 1015 <text key="name" text="Name :" default="" delete_if_empty="true" />1015 <text key="name" text="Name" default="" delete_if_empty="true" /> 1016 1016 </item> 1017 1017 … … 1019 1019 <label text="Edit Soccer" /> 1020 1020 <key key="sport" value="soccer" /> 1021 <text key="name" text="Name :" default="" delete_if_empty="true" />1021 <text key="name" text="Name" default="" delete_if_empty="true" /> 1022 1022 </item> 1023 1023 … … 1025 1025 <label text="Edit Football" /> 1026 1026 <key key="sport" value="football" /> 1027 <text key="name" text="Name :" default="" delete_if_empty="true" />1027 <text key="name" text="Name" default="" delete_if_empty="true" /> 1028 1028 </item> 1029 1029 … … 1031 1031 <label text="Edit Australian Football" /> 1032 1032 <key key="sport" value="australian_football" /> 1033 <text key="name" text="Name :" default="" delete_if_empty="true" />1033 <text key="name" text="Name" default="" delete_if_empty="true" /> 1034 1034 </item> 1035 1035 … … 1037 1037 <label text="Edit Baseball" /> 1038 1038 <key key="sport" value="baseball" /> 1039 <text key="name" text="Name :" default="" delete_if_empty="true" />1039 <text key="name" text="Name" default="" delete_if_empty="true" /> 1040 1040 </item> 1041 1041 … … 1043 1043 <label text="Edit Basketball" /> 1044 1044 <key key="sport" value="basketball" /> 1045 <text key="name" text="Name :" default="" delete_if_empty="true" />1045 <text key="name" text="Name" default="" delete_if_empty="true" /> 1046 1046 </item> 1047 1047 … … 1049 1049 <label text="Edit Golf Course" /> 1050 1050 <key key="leisure" value="golf_course" /> 1051 <text key="name" text="Name :" default="" delete_if_empty="true" />1051 <text key="name" text="Name" default="" delete_if_empty="true" /> 1052 1052 </item> 1053 1053 … … 1055 1055 <label text="Edit Track" /> 1056 1056 <key key="leisure" value="track" /> 1057 <text key="name" text="Name :" default="" delete_if_empty="true" />1057 <text key="name" text="Name" default="" delete_if_empty="true" /> 1058 1058 </item> 1059 1059 … … 1061 1061 <label text="Edit Multi" /> 1062 1062 <key key="sport" value="multi" /> 1063 <text key="name" text="Name :" default="" delete_if_empty="true" />1063 <text key="name" text="Name" default="" delete_if_empty="true" /> 1064 1064 </item> 1065 1065 … … 1067 1067 <label text="Edit 10pin" /> 1068 1068 <key key="sport" value="10pin" /> 1069 <text key="name" text="Name :" default="" delete_if_empty="true" />1069 <text key="name" text="Name" default="" delete_if_empty="true" /> 1070 1070 </item> 1071 1071 … … 1073 1073 <label text="Edit Athletics" /> 1074 1074 <key key="sport" value="athletics" /> 1075 <text key="name" text="Name :" default="" delete_if_empty="true" />1075 <text key="name" text="Name" default="" delete_if_empty="true" /> 1076 1076 </item> 1077 1077 … … 1079 1079 <label text="Edit Boules" /> 1080 1080 <key key="sport" value="boules" /> 1081 <text key="name" text="Name :" default="" delete_if_empty="true" />1081 <text key="name" text="Name" default="" delete_if_empty="true" /> 1082 1082 </item> 1083 1083 … … 1085 1085 <label text="Edit Bowls" /> 1086 1086 <key key="sport" value="bowls" /> 1087 <text key="name" text="Name :" default="" delete_if_empty="true" />1087 <text key="name" text="Name" default="" delete_if_empty="true" /> 1088 1088 </item> 1089 1089 … … 1091 1091 <label text="Edit Climbing" /> 1092 1092 <key key="sport" value="climbing" /> 1093 <text key="name" text="Name :" default="" delete_if_empty="true" />1093 <text key="name" text="Name" default="" delete_if_empty="true" /> 1094 1094 </item> 1095 1095 … … 1097 1097 <label text="Edit Cricket" /> 1098 1098 <key key="sport" value="cricket" /> 1099 <text key="name" text="Name :" default="" delete_if_empty="true" />1099 <text key="name" text="Name" default="" delete_if_empty="true" /> 1100 1100 </item> 1101 1101 … … 1103 1103 <label text="Edit Cricket Nets" /> 1104 1104 <key key="sport" value="cricket_nets" /> 1105 <text key="name" text="Name :" default="" delete_if_empty="true" />1105 <text key="name" text="Name" default="" delete_if_empty="true" /> 1106 1106 </item> 1107 1107 … … 1109 1109 <label text="Edit Croquet" /> 1110 1110 <key key="sport" value="croquet" /> 1111 <text key="name" text="Name :" default="" delete_if_empty="true" />1111 <text key="name" text="Name" default="" delete_if_empty="true" /> 1112 1112 </item> 1113 1113 … … 1115 1115 <label text="Edit Cycling" /> 1116 1116 <key key="sport" value="cycling" /> 1117 <text key="name" text="Name :" default="" delete_if_empty="true" />1117 <text key="name" text="Name" default="" delete_if_empty="true" /> 1118 1118 </item> 1119 1119 … … 1121 1121 <label text="Edit Dog Racing" /> 1122 1122 <key key="sport" value="dog_racing" /> 1123 <text key="name" text="Name :" default="" delete_if_empty="true" />1123 <text key="name" text="Name" default="" delete_if_empty="true" /> 1124 1124 </item> 1125 1125 … … 1127 1127 <label text="Edit Equestrian" /> 1128 1128 <key key="sport" value="equestrian" /> 1129 <text key="name" text="Name :" default="" delete_if_empty="true" />1129 <text key="name" text="Name" default="" delete_if_empty="true" /> 1130 1130 </item> 1131 1131 … … 1133 1133 <label text="Edit Horse Racing" /> 1134 1134 <key key="sport" value="horse_racing" /> 1135 <text key="name" text="Name :" default="" delete_if_empty="true" />1135 <text key="name" text="Name" default="" delete_if_empty="true" /> 1136 1136 </item> 1137 1137 … … 1139 1139 <label text="Edit Golf" /> 1140 1140 <key key="sport" value="golf" /> 1141 <text key="name" text="Name :" default="" delete_if_empty="true" />1141 <text key="name" text="Name" default="" delete_if_empty="true" /> 1142 1142 </item> 1143 1143 … … 1145 1145 <label text="Edit Gymnastics" /> 1146 1146 <key key="sport" value="gymnastics" /> 1147 <text key="name" text="Name :" default="" delete_if_empty="true" />1147 <text key="name" text="Name" default="" delete_if_empty="true" /> 1148 1148 </item> 1149 1149 … … 1151 1151 <label text="Edit Hockey" /> 1152 1152 <key key="sport" value="hockey" /> 1153 <text key="name" text="Name :" default="" delete_if_empty="true" />1153 <text key="name" text="Name" default="" delete_if_empty="true" /> 1154 1154 </item> 1155 1155 … … 1157 1157 <label text="Edit Motor Sports" /> 1158 1158 <key key="sport" value="motor" /> 1159 <text key="name" text="Name :" default="" delete_if_empty="true" />1159 <text key="name" text="Name" default="" delete_if_empty="true" /> 1160 1160 </item> 1161 1161 … … 1163 1163 <label text="Edit Pelota" /> 1164 1164 <key key="sport" value="pelota" /> 1165 <text key="name" text="Name :" default="" delete_if_empty="true" />1165 <text key="name" text="Name" default="" delete_if_empty="true" /> 1166 1166 </item> 1167 1167 … … 1169 1169 <label text="Edit Racquet" /> 1170 1170 <key key="sport" value="racquet" /> 1171 <text key="name" text="Name :" default="" delete_if_empty="true" />1171 <text key="name" text="Name" default="" delete_if_empty="true" /> 1172 1172 </item> 1173 1173 … … 1175 1175 <label text="Edit Rugby" /> 1176 1176 <key key="sport" value="rugby" /> 1177 <text key="name" text="Name :" default="" delete_if_empty="true" />1177 <text key="name" text="Name" default="" delete_if_empty="true" /> 1178 1178 </item> 1179 1179 … … 1181 1181 <label text="Edit Skating" /> 1182 1182 <key key="sport" value="skating" /> 1183 <text key="name" text="Name :" default="" delete_if_empty="true" />1183 <text key="name" text="Name" default="" delete_if_empty="true" /> 1184 1184 </item> 1185 1185 … … 1187 1187 <label text="Edit Skateboard" /> 1188 1188 <key key="sport" value="skateboard" /> 1189 <text key="name" text="Name :" default="" delete_if_empty="true" />1189 <text key="name" text="Name" default="" delete_if_empty="true" /> 1190 1190 </item> 1191 1191 … … 1193 1193 <label text="Edit Swimming" /> 1194 1194 <key key="sport" value="swimming" /> 1195 <text key="name" text="Name :" default="" delete_if_empty="true" />1195 <text key="name" text="Name" default="" delete_if_empty="true" /> 1196 1196 </item> 1197 1197 … … 1199 1199 <label text="Edit Skiing" /> 1200 1200 <key key="sport" value="skiing" /> 1201 <text key="name" text="Name :" default="" delete_if_empty="true" />1201 <text key="name" text="Name" default="" delete_if_empty="true" /> 1202 1202 </item> 1203 1203 … … 1205 1205 <label text="Edit Table Tennis" /> 1206 1206 <key key="sport" value="table_tennis" /> 1207 <text key="name" text="Name :" default="" delete_if_empty="true" />1207 <text key="name" text="Name" default="" delete_if_empty="true" /> 1208 1208 </item> 1209 1209 … … 1211 1211 <label text="Edit Tennis" /> 1212 1212 <key key="sport" value="tennis" /> 1213 <text key="name" text="Name :" default="" delete_if_empty="true" />1213 <text key="name" text="Name" default="" delete_if_empty="true" /> 1214 1214 </item> 1215 1215 … … 1219 1219 <label text="Edit Public Building" /> 1220 1220 <key key="amenity" value="public_building" /> 1221 <text key="name" text="Name :" default="" delete_if_empty="true" />1221 <text key="name" text="Name" default="" delete_if_empty="true" /> 1222 1222 </item> 1223 1223 … … 1225 1225 <label text="Edit Townhall" /> 1226 1226 <key key="amenity" value="townhall" /> 1227 <text key="name" text="Name :" default="" delete_if_empty="true" />1227 <text key="name" text="Name" default="" delete_if_empty="true" /> 1228 1228 </item> 1229 1229 … … 1231 1231 <label text="Edit Fire Station" /> 1232 1232 <key key="amenity" value="fire_station" /> 1233 <text key="name" text="Name :" default="" delete_if_empty="true" />1233 <text key="name" text="Name" default="" delete_if_empty="true" /> 1234 1234 </item> 1235 1235 … … 1237 1237 <label text="Edit Courthouse" /> 1238 1238 <key key="amenity" value="courthouse" /> 1239 <text key="name" text="Name :" default="" delete_if_empty="true" />1239 <text key="name" text="Name" default="" delete_if_empty="true" /> 1240 1240 </item> 1241 1241 … … 1243 1243 <label text="Edit Prison" /> 1244 1244 <key key="amenity" value="prison" /> 1245 <text key="name" text="Name :" default="" delete_if_empty="true" />1245 <text key="name" text="Name" default="" delete_if_empty="true" /> 1246 1246 </item> 1247 1247 … … 1249 1249 <label text="Edit Police" /> 1250 1250 <key key="amenity" value="police" /> 1251 <text key="name" text="Name :" default="" delete_if_empty="true" />1251 <text key="name" text="Name" default="" delete_if_empty="true" /> 1252 1252 </item> 1253 1253 … … 1255 1255 <label text="Edit Post Office" /> 1256 1256 <key key="amenity" value="post_office" /> 1257 <text key="name" text="Name :" default="" delete_if_empty="true" />1257 <text key="name" text="Name" default="" delete_if_empty="true" /> 1258 1258 </item> 1259 1259 … … 1263 1263 <label text="Edit Pharmacy" /> 1264 1264 <key key="amenity" value="pharmacy" /> 1265 <combo key="dispensing" text="Dispensing :" values="yes,no" default="no" delete_if_empty="true" />1266 <text key="name" text="Name :" default="" delete_if_empty="true" />1265 <combo key="dispensing" text="Dispensing" values="yes,no" default="no" delete_if_empty="true" /> 1266 <text key="name" text="Name" default="" delete_if_empty="true" /> 1267 1267 </item> 1268 1268 … … 1270 1270 <label text="Edit Hospital" /> 1271 1271 <key key="amenity" value="hospital" /> 1272 <text key="name" text="Name :" default="" delete_if_empty="true" />1272 <text key="name" text="Name" default="" delete_if_empty="true" /> 1273 1273 </item> 1274 1274 … … 1278 1278 <label text="Edit Kindergarten" /> 1279 1279 <key key="amenity" value="kindergarten" /> 1280 <text key="name" text="Name :" default="" delete_if_empty="true" />1280 <text key="name" text="Name" default="" delete_if_empty="true" /> 1281 1281 </item> 1282 1282 … … 1284 1284 <label text="Edit School" /> 1285 1285 <key key="amenity" value="school" /> 1286 <text key="name" text="Name :" default="" delete_if_empty="true" />1286 <text key="name" text="Name" default="" delete_if_empty="true" /> 1287 1287 </item> 1288 1288 … … 1290 1290 <label text="Edit University" /> 1291 1291 <key key="amenity" value="university" /> 1292 <text key="name" text="Name :" default="" delete_if_empty="true" />1292 <text key="name" text="Name" default="" delete_if_empty="true" /> 1293 1293 </item> 1294 1294 … … 1296 1296 <label text="Edit College" /> 1297 1297 <key key="amenity" value="college" /> 1298 <text key="name" text="Name :" default="" delete_if_empty="true" />1298 <text key="name" text="Name" default="" delete_if_empty="true" /> 1299 1299 </item> 1300 1300 … … 1304 1304 <label text="Edit Cinema" /> 1305 1305 <key key="amenity" value="cinema" /> 1306 <text key="name" text="Name :" default="" delete_if_empty="true" />1306 <text key="name" text="Name" default="" delete_if_empty="true" /> 1307 1307 </item> 1308 1308 … … 1310 1310 <label text="Edit Library" /> 1311 1311 <key key="amenity" value="library" /> 1312 <text key="name" text="Name :" default="" delete_if_empty="true" />1312 <text key="name" text="Name" default="" delete_if_empty="true" /> 1313 1313 </item> 1314 1314 … … 1316 1316 <label text="Edit Arts Centre" /> 1317 1317 <key key="amenity" value="arts_centre" /> 1318 <text key="name" text="Name :" default="" delete_if_empty="true" />1318 <text key="name" text="Name" default="" delete_if_empty="true" /> 1319 1319 </item> 1320 1320 … … 1322 1322 <label text="Edit Theatre" /> 1323 1323 <key key="amenity" value="theatre" /> 1324 <text key="name" text="Name :" default="" delete_if_empty="true" />1324 <text key="name" text="Name" default="" delete_if_empty="true" /> 1325 1325 </item> 1326 1326 … … 1328 1328 <label text="Edit Place of Worship" /> 1329 1329 <key key="amenity" value="place_of_worship" /> 1330 <text key="name" text="Name :" default="" delete_if_empty="true" />1331 <combo key="religion" text="Religion :" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarianist,zoroastrian" default="" delete_if_empty="true" />1332 <combo key="denomination" text="Denomination :" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />1330 <text key="name" text="Name" default="" delete_if_empty="true" /> 1331 <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarianist,zoroastrian" default="" delete_if_empty="true" /> 1332 <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" /> 1333 1333 </item> 1334 1334 … … 1345 1345 <label text="Edit a Bus Station" /> 1346 1346 <key key="amenity" value="bus_station" /> 1347 <text key="name" text="Name :" default="" delete_if_empty="true" />1347 <text key="name" text="Name" default="" delete_if_empty="true" /> 1348 1348 </item> 1349 1349 … … 1359 1359 <label text="Edit a Recycling station" /> 1360 1360 <key key="amenity" value="recycling" /> 1361 <check key="recycling:glass" text="Glass :" default="off" delete_if_empty="true" />1362 <check key="recycling:clothes" text="Clothes :" default="off" delete_if_empty="true" />1363 <check key="recycling:batteries" text="Batteries :" default="off" delete_if_empty="true" />1361 <check key="recycling:glass" text="Glass" default="off" delete_if_empty="true" /> 1362 <check key="recycling:clothes" text="Clothes" default="off" delete_if_empty="true" /> 1363 <check key="recycling:batteries" text="Batteries" default="off" delete_if_empty="true" /> 1364 1364 </item> 1365 1365 … … 1367 1367 <label text="Edit a Taxi station" /> 1368 1368 <key key="amenity" value="taxi" /> 1369 <text key="name" text="Name :" default="" delete_if_empty="true" />1369 <text key="name" text="Name" default="" delete_if_empty="true" /> 1370 1370 </item> 1371 1371 … … 1373 1373 <label text="Edit a Fountain" /> 1374 1374 <key key="amenity" value="fountain" /> 1375 <text key="name" text="Name :" default="" delete_if_empty="true" />1375 <text key="name" text="Name" default="" delete_if_empty="true" /> 1376 1376 </item> 1377 1377 … … 1379 1379 <label text="Edit Drinking Water" /> 1380 1380 <key key="amenity" value="drinking_water" /> 1381 <text key="name" text="Name :" default="" delete_if_empty="true" />1381 <text key="name" text="Name" default="" delete_if_empty="true" /> 1382 1382 </item> 1383 1383 … … 1385 1385 <label text="Edit Bank" /> 1386 1386 <key key="amenity" value="bank" /> 1387 <text key="name" text="Name :" default="" delete_if_empty="true" />1388 <check key="atm" text="Automated Teller Machine :" default="on" delete_if_empty="true" />1387 <text key="name" text="Name" default="" delete_if_empty="true" /> 1388 <check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" /> 1389 1389 </item> 1390 1390 … … 1392 1392 <label text="Edit Money Exchange" /> 1393 1393 <key key="amenity" value="bureau_de_change" /> 1394 <text key="name" text="Name :" default="" delete_if_empty="true" />1394 <text key="name" text="Name" default="" delete_if_empty="true" /> 1395 1395 </item> 1396 1396 … … 1398 1398 <label text="Edit Automated Teller Machine" /> 1399 1399 <key key="amenity" value="atm" /> 1400 <text key="name" text="Provider :" default="" delete_if_empty="true" />1400 <text key="name" text="Provider" default="" delete_if_empty="true" /> 1401 1401 </item> 1402 1402 … … 1405 1405 <label text="Edit Supermarket" /> 1406 1406 <key key="shop" value="supermarket" /> 1407 <text key="name" text="Name :" default="" delete_if_empty="true" />1407 <text key="name" text="Name" default="" delete_if_empty="true" /> 1408 1408 </item> 1409 1409 … … 1411 1411 <label text="Edit Convenience Store" /> 1412 1412 <key key="shop" value="convenience" /> 1413 <text key="name" text="Name :" default="" delete_if_empty="true" />1413 <text key="name" text="Name" default="" delete_if_empty="true" /> 1414 1414 </item> 1415 1415 … … 1417 1417 <label text="Edit Kiosk" /> 1418 1418 <key key="shop" value="kiosk" /> 1419 <text key="name" text="Name :" default="" delete_if_empty="true" />1419 <text key="name" text="Name" default="" delete_if_empty="true" /> 1420 1420 </item> 1421 1421 … … 1423 1423 <label text="Edit Butcher" /> 1424 1424 <key key="shop" value="butcher" /> 1425 <text key="name" text="Name :" default="" delete_if_empty="true" />1425 <text key="name" text="Name" default="" delete_if_empty="true" /> 1426 1426 </item> 1427 1427 1428 1428 <item name="Shops/Baker" icon="presets/empty.png"> 1429 1429 <label text="Edit Baker" /> 1430 <key key="shop" value="baker " />1431 <text key="name" text="Name :" default="" delete_if_empty="true" />1430 <key key="shop" value="bakery" /> 1431 <text key="name" text="Name" default="" delete_if_empty="true" /> 1432 1432 </item> 1433 1433 … … 1435 1435 <label text="Edit Do-it-yourself-store" /> 1436 1436 <key key="shop" value="doityourself" /> 1437 <text key="name" text="Name :" default="" delete_if_empty="true" />1437 <text key="name" text="Name" default="" delete_if_empty="true" /> 1438 1438 </item> 1439 1439 … … 1441 1441 <label text="Edit Dry Cleaning" /> 1442 1442 <key key="shop" value="dry_cleaning" /> 1443 <text key="name" text="Name :" default="" delete_if_empty="true" />1443 <text key="name" text="Name" default="" delete_if_empty="true" /> 1444 1444 </item> 1445 1445 … … 1447 1447 <label text="Edit Laundry" /> 1448 1448 <key key="shop" value="laundry" /> 1449 <text key="name" text="Name :" default="" delete_if_empty="true" />1449 <text key="name" text="Name" default="" delete_if_empty="true" /> 1450 1450 </item> 1451 1451 … … 1453 1453 <label text="Edit Outdoor Shop" /> 1454 1454 <key key="shop" value="outdoor" /> 1455 <text key="name" text="Name :" default="" delete_if_empty="true" />1455 <text key="name" text="Name" default="" delete_if_empty="true" /> 1456 1456 </item> 1457 1457 … … 1463 1463 <label text=" " /> 1464 1464 <key key="place" value="continent" /> 1465 <text key="name" text="Name :" default="" delete_if_empty="true" />1465 <text key="name" text="Name" default="" delete_if_empty="true" /> 1466 1466 </item> 1467 1467 … … 1470 1470 <label text=" " /> 1471 1471 <key key="place" value="country" /> 1472 <text key="name" text="Name :" default="" delete_if_empty="true" />1472 <text key="name" text="Name" default="" delete_if_empty="true" /> 1473 1473 </item> 1474 1474 … … 1477 1477 <label text=" " /> 1478 1478 <key key="place" value="state" /> 1479 <text key="name" text="Name :" default="" delete_if_empty="true" />1479 <text key="name" text="Name" default="" delete_if_empty="true" /> 1480 1480 </item> 1481 1481 … … 1484 1484 <label text=" " /> 1485 1485 <key key="place" value="region" /> 1486 <text key="name" text="Name :" default="" delete_if_empty="true" />1486 <text key="name" text="Name" default="" delete_if_empty="true" /> 1487 1487 </item> 1488 1488 … … 1491 1491 <label text=" " /> 1492 1492 <key key="place" value="county" /> 1493 <text key="name" text="Name :" default="" delete_if_empty="true" />1493 <text key="name" text="Name" default="" delete_if_empty="true" /> 1494 1494 </item> 1495 1495 … … 1498 1498 <label text=" " /> 1499 1499 <key key="place" value="island" /> 1500 <text key="name" text="Name :" default="" delete_if_empty="true" />1500 <text key="name" text="Name" default="" delete_if_empty="true" /> 1501 1501 </item> 1502 1502 … … 1505 1505 <label text=" " /> 1506 1506 <key key="place" value="city" /> 1507 <text key="name" text="Name :" default="" delete_if_empty="true" />1507 <text key="name" text="Name" default="" delete_if_empty="true" /> 1508 1508 </item> 1509 1509 … … 1512 1512 <label text=" " /> 1513 1513 <key key="place" value="town" /> 1514 <text key="name" text="Name :" default="" delete_if_empty="true" />1514 <text key="name" text="Name" default="" delete_if_empty="true" /> 1515 1515 </item> 1516 1516 … … 1519 1519 <label text=" " /> 1520 1520 <key key="place" value="suburb" /> 1521 <text key="name" text="Name :" default="" delete_if_empty="true" />1521 <text key="name" text="Name" default="" delete_if_empty="true" /> 1522 1522 </item> 1523 1523 … … 1526 1526 <label text=" " /> 1527 1527 <key key="place" value="village" /> 1528 <text key="name" text="Name :" default="" delete_if_empty="true" />1528 <text key="name" text="Name" default="" delete_if_empty="true" /> 1529 1529 </item> 1530 1530 … … 1533 1533 <label text=" " /> 1534 1534 <key key="place" value="hamlet" /> 1535 <text key="name" text="Name :" default="" delete_if_empty="true" />1535 <text key="name" text="Name" default="" delete_if_empty="true" /> 1536 1536 </item> 1537 1537 … … 1540 1540 <label text=" " /> 1541 1541 <key key="place" value="locality" /> 1542 <text key="name" text="Name :" default="" delete_if_empty="true" />1542 <text key="name" text="Name" default="" delete_if_empty="true" /> 1543 1543 </item> 1544 1544 … … 1548 1548 <label text="Edit address information" /> 1549 1549 <label text=" " /> 1550 <text key="addr:housenumber" text="House number :" default="" delete_if_empty="true" />1551 <label text=" " /> 1552 <label text="Optional Attributes:" /> 1553 <label text=" " /> 1554 <text key="addr:housename" text="House name :" default="" delete_if_empty="true" />1555 <text key="addr:street" text="Street name :" use_last_as_default="true" delete_if_empty="true" />1556 <text key="addr:city" text="City :" use_last_as_default="true" delete_if_empty="true" />1557 <text key="addr:postcode" text="Post code :" use_last_as_default="true" delete_if_empty="true" />1550 <text key="addr:housenumber" text="House number" default="" delete_if_empty="true" /> 1551 <label text=" " /> 1552 <label text="Optional Attributes:" /> 1553 <label text=" " /> 1554 <text key="addr:housename" text="House name" default="" delete_if_empty="true" /> 1555 <text key="addr:street" text="Street name" use_last_as_default="true" delete_if_empty="true" /> 1556 <text key="addr:city" text="City" use_last_as_default="true" delete_if_empty="true" /> 1557 <text key="addr:postcode" text="Post code" use_last_as_default="true" delete_if_empty="true" /> 1558 1558 </item> 1559 1559 … … 1561 1561 <label text="Edit address interpolation" /> 1562 1562 <label text=" " /> 1563 <combo key="addr:interpolation" text="Numbering scheme :" values="odd,even,all" default="odd" />1563 <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all" default="odd" /> 1564 1564 </item> 1565 1565 … … 1568 1568 <label text=" " /> 1569 1569 <key key="boundary" value="national" /> 1570 <text key="name" text="Name :" default="" delete_if_empty="true" />1570 <text key="name" text="Name" default="" delete_if_empty="true" /> 1571 1571 </item> 1572 1572 … … 1575 1575 <label text=" " /> 1576 1576 <key key="boundary" value="administrative" /> 1577 <text key="name" text="Name :" default="" delete_if_empty="true" />1577 <text key="name" text="Name" default="" delete_if_empty="true" /> 1578 1578 </item> 1579 1579 … … 1582 1582 <label text=" " /> 1583 1583 <key key="boundary" value="civil" /> 1584 <text key="name" text="Name :" default="" delete_if_empty="true" />1584 <text key="name" text="Name" default="" delete_if_empty="true" /> 1585 1585 </item> 1586 1586 … … 1589 1589 <label text=" " /> 1590 1590 <key key="boundary" value="political" /> 1591 <text key="name" text="Name :" default="" delete_if_empty="true" />1591 <text key="name" text="Name" default="" delete_if_empty="true" /> 1592 1592 </item> 1593 1593 … … 1596 1596 <label text=" " /> 1597 1597 <key key="boundary" value="national_park" /> 1598 <text key="name" text="Name :" default="" delete_if_empty="true" />1598 <text key="name" text="Name" default="" delete_if_empty="true" /> 1599 1599 </item> 1600 1600 … … 1605 1605 <label text="Edit Grave Yard" /> 1606 1606 <key key="amenity" value="grave_yard" /> 1607 <text key="name" text="Name :" default="" delete_if_empty="true" />1607 <text key="name" text="Name" default="" delete_if_empty="true" /> 1608 1608 </item> 1609 1609 … … 1612 1612 <label text=" " /> 1613 1613 <key key="landuse" value="farmyard" /> 1614 <text key="name" text="Name :" default="" delete_if_empty="true" />1614 <text key="name" text="Name" default="" delete_if_empty="true" /> 1615 1615 </item> 1616 1616 … … 1619 1619 <label text=" " /> 1620 1620 <key key="landuse" value="farmland" /> 1621 <text key="name" text="Name :" default="" delete_if_empty="true" />1621 <text key="name" text="Name" default="" delete_if_empty="true" /> 1622 1622 </item> 1623 1623 … … 1626 1626 <label text=" " /> 1627 1627 <key key="landuse" value="vineyard" /> 1628 <text key="name" text="Name :" default="" delete_if_empty="true" />1628 <text key="name" text="Name" default="" delete_if_empty="true" /> 1629 1629 </item> 1630 1630 … … 1633 1633 <label text=" " /> 1634 1634 <key key="landuse" value="quarry" /> 1635 <text key="name" text="Name :" default="" delete_if_empty="true" />1635 <text key="name" text="Name" default="" delete_if_empty="true" /> 1636 1636 </item> 1637 1637 … … 1640 1640 <label text=" " /> 1641 1641 <key key="landuse" value="landfill" /> 1642 <text key="name" text="Name :" default="" delete_if_empty="true" />1642 <text key="name" text="Name" default="" delete_if_empty="true" /> 1643 1643 </item> 1644 1644 … … 1647 1647 <label text=" " /> 1648 1648 <key key="landuse" value="basin" /> 1649 <text key="name" text="Name :" default="" delete_if_empty="true" />1649 <text key="name" text="Name" default="" delete_if_empty="true" /> 1650 1650 </item> 1651 1651 … … 1654 1654 <label text=" " /> 1655 1655 <key key="landuse" value="reservoir" /> 1656 <text key="name" text="Name :" default="" delete_if_empty="true" />1656 <text key="name" text="Name" default="" delete_if_empty="true" /> 1657 1657 </item> 1658 1658 … … 1661 1661 <label text=" " /> 1662 1662 <key key="landuse" value="forest" /> 1663 <text key="name" text="Name :" default="" delete_if_empty="true" />1664 <combo key="wood" text="Type :" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />1663 <text key="name" text="Name" default="" delete_if_empty="true" /> 1664 <combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" /> 1665 1665 </item> 1666 1666 … … 1669 1669 <label text=" " /> 1670 1670 <key key="landuse" value="allotments" /> 1671 <text key="name" text="Name :" default="" delete_if_empty="true" />1671 <text key="name" text="Name" default="" delete_if_empty="true" /> 1672 1672 </item> 1673 1673 … … 1676 1676 <label text=" " /> 1677 1677 <key key="landuse" value="residential" /> 1678 <text key="name" text="Name :" default="" delete_if_empty="true" />1678 <text key="name" text="Name" default="" delete_if_empty="true" /> 1679 1679 </item> 1680 1680 … … 1683 1683 <label text=" " /> 1684 1684 <key key="landuse" value="retail" /> 1685 <text key="name" text="Name :" default="" delete_if_empty="true" />1685 <text key="name" text="Name" default="" delete_if_empty="true" /> 1686 1686 </item> 1687 1687 … … 1690 1690 <label text=" " /> 1691 1691 <key key="landuse" value="commercial" /> 1692 <text key="name" text="Name :" default="" delete_if_empty="true" />1692 <text key="name" text="Name" default="" delete_if_empty="true" /> 1693 1693 </item> 1694 1694 … … 1697 1697 <label text=" " /> 1698 1698 <key key="landuse" value="industrial" /> 1699 <text key="name" text="Name :" default="" delete_if_empty="true" />1699 <text key="name" text="Name" default="" delete_if_empty="true" /> 1700 1700 </item> 1701 1701 … … 1704 1704 <label text=" " /> 1705 1705 <key key="landuse" value="brownfield" /> 1706 <text key="name" text="Name :" default="" delete_if_empty="true" />1706 <text key="name" text="Name" default="" delete_if_empty="true" /> 1707 1707 </item> 1708 1708 … … 1711 1711 <label text=" " /> 1712 1712 <key key="landuse" value="greenfield" /> 1713 <text key="name" text="Name :" default="" delete_if_empty="true" />1713 <text key="name" text="Name" default="" delete_if_empty="true" /> 1714 1714 </item> 1715 1715 … … 1718 1718 <label text=" " /> 1719 1719 <key key="landuse" value="railway" /> 1720 <text key="name" text="Name :" default="" delete_if_empty="true" />1720 <text key="name" text="Name" default="" delete_if_empty="true" /> 1721 1721 </item> 1722 1722 … … 1725 1725 <label text=" " /> 1726 1726 <key key="landuse" value="construction" /> 1727 <text key="name" text="Name :" default="" delete_if_empty="true" />1727 <text key="name" text="Name" default="" delete_if_empty="true" /> 1728 1728 </item> 1729 1729 … … 1732 1732 <label text=" " /> 1733 1733 <key key="landuse" value="military" /> 1734 <text key="name" text="Name :" default="" delete_if_empty="true" />1734 <text key="name" text="Name" default="" delete_if_empty="true" /> 1735 1735 </item> 1736 1736 … … 1739 1739 <label text=" " /> 1740 1740 <key key="landuse" value="cemetery" /> 1741 <text key="name" text="Name :" default="" delete_if_empty="true" />1741 <text key="name" text="Name" default="" delete_if_empty="true" /> 1742 1742 </item> 1743 1743 … … 1746 1746 <label text=" " /> 1747 1747 <key key="landuse" value="village_green" /> 1748 <text key="name" text="Name :" default="" delete_if_empty="true" />1748 <text key="name" text="Name" default="" delete_if_empty="true" /> 1749 1749 </item> 1750 1750 … … 1753 1753 <label text=" " /> 1754 1754 <key key="landuse" value="grass" /> 1755 <text key="name" text="Name :" default="" delete_if_empty="true" />1755 <text key="name" text="Name" default="" delete_if_empty="true" /> 1756 1756 </item> 1757 1757 … … 1760 1760 <label text=" " /> 1761 1761 <key key="landuse" value="recreation_ground" /> 1762 <text key="name" text="Name :" default="" delete_if_empty="true" />1762 <text key="name" text="Name" default="" delete_if_empty="true" /> 1763 1763 </item> 1764 1764 … … 1768 1768 <label text="Edit Water" /> 1769 1769 <key key="natural" value="water" /> 1770 <text key="name" text="Name :" default="" delete_if_empty="true" />1770 <text key="name" text="Name" default="" delete_if_empty="true" /> 1771 1771 </item> 1772 1772 … … 1774 1774 <label text="Edit Land" /> 1775 1775 <key key="natural" value="land" /> 1776 <text key="name" text="Name :" default="" delete_if_empty="true" />1776 <text key="name" text="Name" default="" delete_if_empty="true" /> 1777 1777 </item> 1778 1778 … … 1780 1780 <label text="Edit Spring" /> 1781 1781 <key key="natural" value="spring" /> 1782 <text key="name" text="Name :" default="" delete_if_empty="true" />1782 <text key="name" text="Name" default="" delete_if_empty="true" /> 1783 1783 </item> 1784 1784 … … 1786 1786 <label text="Edit Peak" /> 1787 1787 <key key="natural" value="peak" /> 1788 <text key="name" text="Name :" default="" delete_if_empty="true" />1788 <text key="name" text="Name" default="" delete_if_empty="true" /> 1789 1789 </item> 1790 1790 … … 1792 1792 <label text="Edit Glacier" /> 1793 1793 <key key="natural" value="glacier" /> 1794 <text key="name" text="Name :" default="" delete_if_empty="true" />1794 <text key="name" text="Name" default="" delete_if_empty="true" /> 1795 1795 </item> 1796 1796 … … 1798 1798 <label text="Edit Volcano" /> 1799 1799 <key key="natural" value="volcano" /> 1800 <text key="name" text="Name :" default="" delete_if_empty="true" />1800 <text key="name" text="Name" default="" delete_if_empty="true" /> 1801 1801 </item> 1802 1802 … … 1804 1804 <label text="Edit Cliff" /> 1805 1805 <key key="natural" value="cliff" /> 1806 <text key="name" text="Name :" default="" delete_if_empty="true" />1806 <text key="name" text="Name" default="" delete_if_empty="true" /> 1807 1807 </item> 1808 1808 … … 1810 1810 <label text="Edit Scree" /> 1811 1811 <key key="natural" value="scree" /> 1812 <text key="name" text="Name :" default="" delete_if_empty="true" />1812 <text key="name" text="Name" default="" delete_if_empty="true" /> 1813 1813 </item> 1814 1814 … … 1816 1816 <label text="Edit Scrub" /> 1817 1817 <key key="natural" value="scrub" /> 1818 <text key="name" text="Name :" default="" delete_if_empty="true" />1818 <text key="name" text="Name" default="" delete_if_empty="true" /> 1819 1819 </item> 1820 1820 … … 1822 1822 <label text="Edit Fell" /> 1823 1823 <key key="natural" value="fell" /> 1824 <text key="name" text="Name :" default="" delete_if_empty="true" />1824 <text key="name" text="Name" default="" delete_if_empty="true" /> 1825 1825 </item> 1826 1826 … … 1828 1828 <label text="Edit Heath" /> 1829 1829 <key key="natural" value="heath" /> 1830 <text key="name" text="Name :" default="" delete_if_empty="true" />1830 <text key="name" text="Name" default="" delete_if_empty="true" /> 1831 1831 </item> 1832 1832 … … 1834 1834 <label text="Edit Wood" /> 1835 1835 <key key="natural" value="wood" /> 1836 <text key="name" text="Name :" default="" delete_if_empty="true" />1837 <combo key="wood" text="Type :" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />1836 <text key="name" text="Name" default="" delete_if_empty="true" /> 1837 <combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" /> 1838 1838 </item> 1839 1839 … … 1841 1841 <label text="Edit Marsh" /> 1842 1842 <key key="natural" value="marsh" /> 1843 <text key="name" text="Name :" default="" delete_if_empty="true" />1843 <text key="name" text="Name" default="" delete_if_empty="true" /> 1844 1844 </item> 1845 1845 … … 1847 1847 <label text="Edit Coastline" /> 1848 1848 <key key="natural" value="coastline" /> 1849 <text key="name" text="Name :" default="" delete_if_empty="true" />1849 <text key="name" text="Name" default="" delete_if_empty="true" /> 1850 1850 </item> 1851 1851 … … 1853 1853 <label text="Edit Mud" /> 1854 1854 <key key="natural" value="mud" /> 1855 <text key="name" text="Name :" default="" delete_if_empty="true" />1855 <text key="name" text="Name" default="" delete_if_empty="true" /> 1856 1856 </item> 1857 1857 … … 1859 1859 <label text="Edit Beach" /> 1860 1860 <key key="natural" value="beach" /> 1861 <text key="name" text="Name :" default="" delete_if_empty="true" />1861 <text key="name" text="Name" default="" delete_if_empty="true" /> 1862 1862 </item> 1863 1863 … … 1865 1865 <label text="Edit Bay" /> 1866 1866 <key key="natural" value="bay" /> 1867 <text key="name" text="Name :" default="" delete_if_empty="true" />1867 <text key="name" text="Name" default="" delete_if_empty="true" /> 1868 1868 </item> 1869 1869 … … 1871 1871 <label text="Edit Cave Entrance" /> 1872 1872 <key key="natural" value="cave_entrance" /> 1873 <text key="name" text="Name :" default="" delete_if_empty="true" />1873 <text key="name" text="Name" default="" delete_if_empty="true" /> 1874 1874 </item> 1875 1875 … … 1880 1880 <label text="Edit Works" /> 1881 1881 <key key="man_made" value="works" /> 1882 <text key="name" text="Name :" default="" delete_if_empty="true" />1882 <text key="name" text="Name" default="" delete_if_empty="true" /> 1883 1883 </item> 1884 1884 … … 1886 1886 <label text="Edit Power Wind" /> 1887 1887 <key key="man_made" value="power_wind" /> 1888 <text key="name" text="Name :" default="" delete_if_empty="true" />1888 <text key="name" text="Name" default="" delete_if_empty="true" /> 1889 1889 </item> 1890 1890 … … 1892 1892 <label text="Edit Power Hydro" /> 1893 1893 <key key="man_made" value="power_hydro" /> 1894 <text key="name" text="Name :" default="" delete_if_empty="true" />1894 <text key="name" text="Name" default="" delete_if_empty="true" /> 1895 1895 </item> 1896 1896 … … 1898 1898 <label text="Edit Power Fossil" /> 1899 1899 <key key="man_made" value="power_fossil" /> 1900 <text key="name" text="Name :" default="" delete_if_empty="true" />1900 <text key="name" text="Name" default="" delete_if_empty="true" /> 1901 1901 </item> 1902 1902 … … 1904 1904 <label text="Edit Power Nuclear" /> 1905 1905 <key key="man_made" value="power_nuclear" /> 1906 <text key="name" text="Name :" default="" delete_if_empty="true" />1906 <text key="name" text="Name" default="" delete_if_empty="true" /> 1907 1907 </item> 1908 1908 … … 1910 1910 <label text="Edit Tower" /> 1911 1911 <key key="man_made" value="tower" /> 1912 <text key="name" text="Name :" default="" delete_if_empty="true" />1912 <text key="name" text="Name" default="" delete_if_empty="true" /> 1913 1913 </item> 1914 1914 … … 1916 1916 <label text="Edit Water Tower" /> 1917 1917 <key key="man_made" value="water_tower" /> 1918 <text key="name" text="Name :" default="" delete_if_empty="true" />1918 <text key="name" text="Name" default="" delete_if_empty="true" /> 1919 1919 </item> 1920 1920 … … 1922 1922 <label text="Edit Gasometer" /> 1923 1923 <key key="man_made" value="gasometer" /> 1924 <text key="name" text="Name :" default="" delete_if_empty="true" />1924 <text key="name" text="Name" default="" delete_if_empty="true" /> 1925 1925 </item> 1926 1926 … … 1928 1928 <label text="Edit Covered Reservoir" /> 1929 1929 <key key="man_made" value="reservoir_covered" /> 1930 <text key="name" text="Name :" default="" delete_if_empty="true" />1930 <text key="name" text="Name" default="" delete_if_empty="true" /> 1931 1931 </item> 1932 1932 … … 1934 1934 <label text="Edit Lighthouse" /> 1935 1935 <key key="man_made" value="lighthouse" /> 1936 <text key="name" text="Name :" default="" delete_if_empty="true" />1936 <text key="name" text="Name" default="" delete_if_empty="true" /> 1937 1937 </item> 1938 1938 … … 1940 1940 <label text="Edit Windmill" /> 1941 1941 <key key="man_made" value="windmill" /> 1942 <text key="name" text="Name :" default="" delete_if_empty="true" />1942 <text key="name" text="Name" default="" delete_if_empty="true" /> 1943 1943 </item> 1944 1944 … … 1946 1946 <label text="Edit Pier" /> 1947 1947 <key key="man_made" value="pier" /> 1948 <text key="name" text="Name :" default="" delete_if_empty="true" />1948 <text key="name" text="Name" default="" delete_if_empty="true" /> 1949 1949 </item> 1950 1950 … … 1952 1952 <label text="Edit Pipeline" /> 1953 1953 <key key="man_made" value="pipeline" /> 1954 <text key="name" text="Name :" default="" delete_if_empty="true" />1954 <text key="name" text="Name" default="" delete_if_empty="true" /> 1955 1955 </item> 1956 1956 … … 1958 1958 <label text="Edit Wastewater Plant" /> 1959 1959 <key key="man_made" value="wastewater_plant" /> 1960 <text key="name" text="Name :" default="" delete_if_empty="true" />1960 <text key="name" text="Name" default="" delete_if_empty="true" /> 1961 1961 </item> 1962 1962 … … 1964 1964 <label text="Edit Crane" /> 1965 1965 <key key="man_made" value="crane" /> 1966 <text key="name" text="Name :" default="" delete_if_empty="true" />1966 <text key="name" text="Name" default="" delete_if_empty="true" /> 1967 1967 </item> 1968 1968 … … 1970 1970 <label text="Edit Beacon" /> 1971 1971 <key key="man_made" value="beacon" /> 1972 <text key="name" text="Name :" default="" delete_if_empty="true" />1972 <text key="name" text="Name" default="" delete_if_empty="true" /> 1973 1973 </item> 1974 1974 … … 1976 1976 <label text="Edit Survey Point" /> 1977 1977 <key key="man_made" value="survey_point" /> 1978 <text key="name" text="Name :" default="" delete_if_empty="true" />1978 <text key="name" text="Name" default="" delete_if_empty="true" /> 1979 1979 </item> 1980 1980 -
trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
r668 r674 245 245 newSelection.add(wayToAdd); 246 246 247 Boolean warnme=false; 247 248 // now copy all relations to new way also 248 249 for (Relation r : Main.ds.relations) { … … 256 257 em.member = wayToAdd; 257 258 em.role = rm.role; 259 if(em.role.length() > 0) 260 warnme = true; 258 261 c.members.add(em); 259 262 commandList.add(new ChangeCommand(r, c)); 263 break; 260 264 } 261 265 } 262 266 } 263 267 } 268 if(warnme) 269 JOptionPane.showMessageDialog(Main.parent, tr("A role based relation membership was copied to both new ways.\nYou should verify this and correct it when necessary.")); 264 270 } 265 271 -
trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
r655 r674 12 12 import java.util.HashSet; 13 13 import java.util.HashMap; 14 import java.util.Iterator; 14 15 import java.util.LinkedList; 15 16 import java.util.List; … … 24 25 import org.openstreetmap.josm.data.osm.WaySegment; 25 26 import org.openstreetmap.josm.data.osm.Relation; 27 import org.openstreetmap.josm.data.osm.RelationMember; 26 28 import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor; 29 import org.openstreetmap.josm.data.osm.visitor.NameVisitor; 27 30 import org.openstreetmap.josm.gui.MapFrame; 28 31 import org.openstreetmap.josm.tools.*; … … 163 166 * nothing to delete. 164 167 */ 168 private int testRelation(Relation ref, OsmPrimitive osm) 169 { 170 NameVisitor n = new NameVisitor(); 171 ref.visit(n); 172 NameVisitor s = new NameVisitor(); 173 osm.visit(s); 174 String role = new String(); 175 for (RelationMember m : ref.members) 176 { 177 if (m.member == osm) 178 { 179 role = m.role; 180 break; 181 } 182 } 183 if (role.length() > 0) 184 { 185 return JOptionPane.showConfirmDialog(Main.parent, 186 tr("Selection \"{0}\" is used by relation \"{1}\" with role {2}.\nDelete from relation?", s.name, n.name, role), 187 tr("Conflicting relation"), JOptionPane.YES_NO_OPTION); 188 } 189 else 190 { 191 return JOptionPane.showConfirmDialog(Main.parent, 192 tr("Selection \"{0}\" is used by relation \"{1}\".\nDelete from relation?", s.name, n.name), 193 tr("Conflicting relation"), JOptionPane.YES_NO_OPTION); 194 } 195 } 196 165 197 private Command delete(Collection<OsmPrimitive> selection, boolean alsoDeleteNodesInWay) { 166 198 if (selection.isEmpty()) return null; … … 168 200 Collection<OsmPrimitive> del = new HashSet<OsmPrimitive>(selection); 169 201 Collection<Way> waysToBeChanged = new HashSet<Way>(); 202 HashMap<OsmPrimitive, Collection<OsmPrimitive>> relationsToBeChanged = new HashMap<OsmPrimitive, Collection<OsmPrimitive>>(); 170 203 171 204 if (alsoDeleteNodesInWay) { … … 197 230 waysToBeChanged.add((Way) ref); 198 231 } else if (ref instanceof Relation) { 199 JOptionPane.showMessageDialog(Main.parent, 200 tr("Cannot delete: Selection is used by relation")); 201 return null; 232 if (testRelation((Relation)ref, osm) == JOptionPane.YES_OPTION) 233 { 234 Collection<OsmPrimitive> relset = relationsToBeChanged.get(ref); 235 if(relset == null) relset = new HashSet<OsmPrimitive>(); 236 relset.add(osm); 237 relationsToBeChanged.put(ref, relset); 238 } 239 else 240 return null; 202 241 } else { 203 242 return null; … … 218 257 if (del.contains(ref)) continue; 219 258 if (ref instanceof Relation) { 220 JOptionPane.showMessageDialog(Main.parent, 221 tr("Cannot delete: Selection is used by relation")); 259 Boolean found = false; 260 Collection<OsmPrimitive> relset = relationsToBeChanged.get(ref); 261 if (relset == null) 262 relset = new HashSet<OsmPrimitive>(); 263 else 264 { 265 for (OsmPrimitive m : relset) { 266 if(m == w) 267 { 268 found = true; 269 break; 270 } 271 } 272 } 273 if (!found) 274 { 275 if (testRelation((Relation)ref, w) == JOptionPane.YES_OPTION) 276 { 277 relset.add(w); 278 relationsToBeChanged.put(ref, relset); 279 } 280 else 281 return null; 282 } 222 283 } else { 223 284 return null; … … 227 288 cmds.add(new ChangeCommand(w, wnew)); 228 289 } 290 } 291 292 Iterator<OsmPrimitive> iterator = relationsToBeChanged.keySet().iterator(); 293 while(iterator.hasNext()) 294 { 295 Relation cur = (Relation)iterator.next(); 296 Relation rel = new Relation(cur); 297 for(OsmPrimitive osm : relationsToBeChanged.get(cur)) 298 { 299 for (RelationMember rm : rel.members) { 300 if (rm.member == osm) 301 { 302 RelationMember mem = new RelationMember(); 303 mem.role = rm.role; 304 mem.member = rm.member; 305 rel.members.remove(mem); 306 break; 307 } 308 } 309 } 310 cmds.add(new ChangeCommand(cur, rel)); 229 311 } 230 312 -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java
r669 r674 147 147 148 148 JLabel help = new JLabel("<html><em>"+ 149 "This is the basic relation editor which allows you to change the relation's tags " +149 tr("This is the basic relation editor which allows you to change the relation's tags " + 150 150 "as well as the members. In addition to this we should have a smart editor that " + 151 "detects the type of relationship and limits your choices in a sensible way. </em></html>");151 "detects the type of relationship and limits your choices in a sensible way.")+"</em></html>"); 152 152 153 153 getContentPane().add(help, BorderLayout.NORTH); … … 224 224 })); 225 225 226 buttonPanel.add(createButton(marktr("Delete Selected"),"deleteselected", tr("Delete all currently selected objects from releation"), KeyEvent.VK_R, new ActionListener() { 227 public void actionPerformed(ActionEvent e) { 228 deleteSelected(); 229 } 230 })); 231 226 232 buttonPanel.add(createButton(marktr("Delete"),"delete", tr("Remove the member in the current table row from this relation"), KeyEvent.VK_D, new ActionListener() { 227 233 public void actionPerformed(ActionEvent e) { … … 259 265 refreshTables(); 260 266 261 setSize(new Dimension( 400, 500));267 setSize(new Dimension(600, 500)); 262 268 setLocationRelativeTo(Main.parent); 263 269 } … … 311 317 refreshTables(); 312 318 } 319 320 private void deleteSelected() { 321 for (OsmPrimitive p : Main.ds.getSelected()) { 322 Relation c = new Relation(clone); 323 for (RelationMember rm : c.members) { 324 if (rm.member == p) 325 { 326 RelationMember mem = new RelationMember(); 327 mem.role = rm.role; 328 mem.member = rm.member; 329 clone.members.remove(mem); 330 } 331 } 332 } 333 refreshTables(); 334 } 335 313 336 private void downloadRelationMembers() { 314 337 -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
r627 r674 128 128 originalValue = DIFFERENT; 129 129 } 130 p.add(new JLabel(t ext), GBC.std().insets(0,0,10,0));130 p.add(new JLabel(tr(text)+":"), GBC.std().insets(0,0,10,0)); 131 131 p.add(value, GBC.eol().fill(GBC.HORIZONTAL)); 132 132 } … … 174 174 QuadStateCheckBox.State.NOT_SELECTED : 175 175 QuadStateCheckBox.State.UNSET; 176 check = new QuadStateCheckBox(t ext, initialState,176 check = new QuadStateCheckBox(tr(text), initialState, 177 177 new QuadStateCheckBox.State[] { 178 178 QuadStateCheckBox.State.SELECTED, … … 184 184 // in "partial" state. 185 185 initialState = QuadStateCheckBox.State.PARTIAL; 186 check = new QuadStateCheckBox(t ext, QuadStateCheckBox.State.PARTIAL,186 check = new QuadStateCheckBox(tr(text), QuadStateCheckBox.State.PARTIAL, 187 187 new QuadStateCheckBox.State[] { 188 188 QuadStateCheckBox.State.PARTIAL, … … 236 236 } 237 237 for (int i=0; i<value_array.length; i++) { 238 lhm.put(value_array[i], display_array[i]);238 lhm.put(value_array[i], tr(display_array[i])); 239 239 } 240 240 for (String s : usage.values) { … … 250 250 combo.setSelectedItem(DIFFERENT); originalValue=DIFFERENT; 251 251 } 252 p.add(new JLabel(t ext), GBC.std().insets(0,0,10,0));252 p.add(new JLabel(tr(text)+":"), GBC.std().insets(0,0,10,0)); 253 253 p.add(combo, GBC.eol().fill(GBC.HORIZONTAL)); 254 254 } … … 277 277 278 278 @Override public void addToPanel(JPanel p, Collection<OsmPrimitive> sel) { 279 p.add(new JLabel(t ext), GBC.eol());279 p.add(new JLabel(tr(text)), GBC.eol()); 280 280 } 281 281 @Override public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {} … … 310 310 */ 311 311 public void setName(String name) { 312 putValue(Action.NAME, name);312 putValue(Action.NAME, tr(name)); 313 313 putValue("toolbar", "tagging_"+name); 314 314 }
Note:
See TracChangeset
for help on using the changeset viewer.
