Changeset 16787 in josm
- Timestamp:
- 2020-07-17T21:30:13+02:00 (5 years ago)
- Location:
- trunk/resources
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/resources/data/defaultpresets.xml
r16763 r16787 5297 5297 <optional> 5298 5298 <reference ref="name_operator" /> 5299 <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" /> 5299 <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" /> 5300 5300 <checkgroup columns="3"> 5301 5301 <check key="covered" text="Covered" /> … … 5313 5313 <text key="depth" text="Depth in meters" /> 5314 5314 <text key="operator" text="Operator" /> 5315 <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" /> 5315 <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" /> 5316 5316 <check key="headframe" text="Visible Headframe" /> 5317 5317 <check key="disused" text="Disused" /> … … 5324 5324 <text key="length" text="Length in meters" /> 5325 5325 <text key="operator" text="Operator" /> 5326 <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" /> 5326 <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" /> 5327 5327 <check key="disused" text="Disused" /> 5328 5328 </item> <!-- Adit --> … … 6232 6232 <optional> 6233 6233 <text key="name" text="Name" /> 6234 <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" /> 6234 <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" /> 6235 6235 </optional> 6236 6236 </item> <!-- Mine --> … … 8119 8119 <key key="landuse" value="quarry" /> 8120 8120 <reference ref="name_operator" /> 8121 <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" /> 8121 <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" /> 8122 8122 </item> <!-- Quarry --> 8123 8123 </group> <!-- Landuse --> -
trunk/resources/data/validator/deprecated.mapcss
r16762 r16787 2034 2034 fixAdd: "lamp_type=electric"; 2035 2035 } 2036 *[generator:type=solar_photovoltaic_panels] { 2037 throwWarning: tr("{0} is deprecated", "{0.tag}"); 2038 suggestAlternative: "generator:type=solar_photovoltaic_panel"; 2039 group: tr("deprecated tagging"); 2040 fixAdd: "generator:type=solar_photovoltaic_panel"; 2041 } 2042 *[building=part] { 2043 throwWarning: tr("{0} is deprecated", "{0.tag}"); 2044 suggestAlternative: "building:part=yes"; 2045 group: tr("deprecated tagging"); 2046 /* without autofix, it is not clear if a building or a building part is mapped */ 2047 } 2048 2049 /* When tags are deprecated they should be added to ignoretags.cfg too. */ -
trunk/resources/data/validator/ignoretags.cfg
r16763 r16787 8 8 ; F: ignore tag if key ends with this string. 9 9 ; 10 ; This file includes also keys and tags which have a deprecated warning (section 11 ; at the bottom). This avoids a duplicate warning in severity other (#19180). 10 12 ; 11 13 ; Ignore valid and semi-valid keys that start with... … … 199 201 K:building=civic 200 202 K:building=clinic 203 K:building=home 201 204 K:building=houseboat 202 205 K:building=shop … … 205 208 K:building=semidetached_house 206 209 K:building=slurry_tank 210 K:building=tank 207 211 K:building=trullo 208 212 K:leisure=recreation_ground … … 221 225 K:land_area=administrative 222 226 K:attraction=summer_toboggan 227 K:water=pool 223 228 ; 224 229 ; Highway Key/Value Pairs … … 259 264 K:historic=wreck 260 265 K:historic=heritage 266 K:historic=farm 261 267 ; 262 268 ; Landcover Tags … … 682 688 K:lanes=-3 683 689 K:lanes=-4 684 ; 685 ; Tags not yet decided (to remove from this section when added or deprecated) 690 K:generator:type=solar_photovoltaic_panels 691 K:building=part 692 ; 693 ; Tags not yet decided (to remove from this section when added or moved up when deprecated) 686 694 ; see josm tickets: 17770 15309 15774 16315 16658 16793 687 695 ; -
trunk/resources/images/presets/misc/fixme.svg
r13363 r16787 15 15 id="svg2" 16 16 version="1.1" 17 inkscape:version="0.9 1 r13725"18 sodipodi:docname="fixme 1.svg">17 inkscape:version="0.92.3 (2405546, 2018-03-11)" 18 sodipodi:docname="fixme.svg"> 19 19 <defs 20 20 id="defs4" /> … … 26 26 inkscape:pageopacity="0.0" 27 27 inkscape:pageshadow="2" 28 inkscape:zoom="2 2.4"29 inkscape:cx=" -4.0420854"30 inkscape:cy=" 7.1721423"28 inkscape:zoom="25.584007" 29 inkscape:cx="2.4921117" 30 inkscape:cy="8.7547445" 31 31 inkscape:document-units="px" 32 32 inkscape:current-layer="layer1" … … 34 34 units="px" 35 35 inkscape:window-width="1680" 36 inkscape:window-height="98 8"36 inkscape:window-height="987" 37 37 inkscape:window-x="-8" 38 38 inkscape:window-y="-8" … … 101 101 style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" 102 102 id="rect4164" 103 width=" 8"104 height="2.9998 782"105 x=" 4"103 width="9" 104 height="2.9998605" 105 x="3" 106 106 y="1037.3622" /> 107 107 <rect 108 108 style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" 109 109 id="rect4166" 110 width=" 6"111 height="2.9999 478"112 x=" 4"110 width="7" 111 height="2.9999826" 112 x="3" 113 113 y="1043.3622" /> 114 114 </g> -
trunk/resources/images/presets/misc/fixme_annotation.svg
r13363 r16787 15 15 id="svg2" 16 16 version="1.1" 17 inkscape:version="0.9 1 r13725"18 sodipodi:docname="fixme 4.svg">17 inkscape:version="0.92.3 (2405546, 2018-03-11)" 18 sodipodi:docname="fixme_annotation.svg"> 19 19 <defs 20 20 id="defs4" /> … … 26 26 inkscape:pageopacity="0.0" 27 27 inkscape:pageshadow="2" 28 inkscape:zoom=" 31.678384"29 inkscape:cx=" 10.322295"30 inkscape:cy="1 8.469253"28 inkscape:zoom="18.090625" 29 inkscape:cx="3.7830558" 30 inkscape:cy="14.850462" 31 31 inkscape:document-units="px" 32 32 inkscape:current-layer="layer1" … … 34 34 units="px" 35 35 inkscape:window-width="1680" 36 inkscape:window-height="98 8"36 inkscape:window-height="987" 37 37 inkscape:window-x="-8" 38 38 inkscape:window-y="-8" … … 101 101 style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" 102 102 id="rect4140" 103 width=" 3"104 height=" 1"105 x="1 8"103 width="4" 104 height="0.9999826" 105 x="17" 106 106 y="1030.3622" /> 107 107 <rect 108 108 style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" 109 109 id="rect4142" 110 width=" 2"111 height="1.000104 5"112 x="1 8"110 width="3" 111 height="1.0001047" 112 x="17" 113 113 y="1033.3622" /> 114 114 </g>
Note:
See TracChangeset
for help on using the changeset viewer.