Changeset 16787 in josm


Ignore:
Timestamp:
2020-07-17T21:30:13+02:00 (3 months ago)
Author:
Klumbumbus
Message:

see #19180

  • deprecate generator:type=solar_photovoltaic_panels and building=part
  • ignore building=home, building=tank, water=pool, historic=farm
  • add resource=clay
  • adjust fixme icons to avoid possible rendering artifacts
Location:
trunk/resources
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r16763 r16787  
    52975297            <optional>
    52985298                <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" />
    53005300                <checkgroup columns="3">
    53015301                    <check key="covered" text="Covered" />
     
    53135313            <text key="depth" text="Depth in meters" />
    53145314            <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" />
    53165316            <check key="headframe" text="Visible Headframe" />
    53175317            <check key="disused" text="Disused" />
     
    53245324            <text key="length" text="Length in meters" />
    53255325            <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" />
    53275327            <check key="disused" text="Disused" />
    53285328        </item> <!-- Adit -->
     
    62326232            <optional>
    62336233                <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" />
    62356235            </optional>
    62366236        </item> <!-- Mine -->
     
    81198119            <key key="landuse" value="quarry" />
    81208120            <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" />
    81228122        </item> <!-- Quarry -->
    81238123    </group> <!-- Landuse -->
  • trunk/resources/data/validator/deprecated.mapcss

    r16762 r16787  
    20342034  fixAdd: "lamp_type=electric";
    20352035}
     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  
    88; F:  ignore tag if key ends with this string.
    99;
     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).
    1012;
    1113; Ignore valid and semi-valid keys that start with...
     
    199201K:building=civic
    200202K:building=clinic
     203K:building=home
    201204K:building=houseboat
    202205K:building=shop
     
    205208K:building=semidetached_house
    206209K:building=slurry_tank
     210K:building=tank
    207211K:building=trullo
    208212K:leisure=recreation_ground
     
    221225K:land_area=administrative
    222226K:attraction=summer_toboggan
     227K:water=pool
    223228;
    224229; Highway Key/Value Pairs
     
    259264K:historic=wreck
    260265K:historic=heritage
     266K:historic=farm
    261267;
    262268; Landcover Tags
     
    682688K:lanes=-3
    683689K:lanes=-4
    684 ;
    685 ; Tags not yet decided (to remove from this section when added or deprecated)
     690K:generator:type=solar_photovoltaic_panels
     691K:building=part
     692;
     693; Tags not yet decided (to remove from this section when added or moved up when deprecated)
    686694; see josm tickets: 17770 15309 15774 16315 16658 16793
    687695;
  • trunk/resources/images/presets/misc/fixme.svg

    r13363 r16787  
    1515   id="svg2"
    1616   version="1.1"
    17    inkscape:version="0.91 r13725"
    18    sodipodi:docname="fixme1.svg">
     17   inkscape:version="0.92.3 (2405546, 2018-03-11)"
     18   sodipodi:docname="fixme.svg">
    1919  <defs
    2020     id="defs4" />
     
    2626     inkscape:pageopacity="0.0"
    2727     inkscape:pageshadow="2"
    28      inkscape:zoom="22.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"
    3131     inkscape:document-units="px"
    3232     inkscape:current-layer="layer1"
     
    3434     units="px"
    3535     inkscape:window-width="1680"
    36      inkscape:window-height="988"
     36     inkscape:window-height="987"
    3737     inkscape:window-x="-8"
    3838     inkscape:window-y="-8"
     
    101101       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"
    102102       id="rect4164"
    103        width="8"
    104        height="2.9998782"
    105        x="4"
     103       width="9"
     104       height="2.9998605"
     105       x="3"
    106106       y="1037.3622" />
    107107    <rect
    108108       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"
    109109       id="rect4166"
    110        width="6"
    111        height="2.9999478"
    112        x="4"
     110       width="7"
     111       height="2.9999826"
     112       x="3"
    113113       y="1043.3622" />
    114114  </g>
  • trunk/resources/images/presets/misc/fixme_annotation.svg

    r13363 r16787  
    1515   id="svg2"
    1616   version="1.1"
    17    inkscape:version="0.91 r13725"
    18    sodipodi:docname="fixme4.svg">
     17   inkscape:version="0.92.3 (2405546, 2018-03-11)"
     18   sodipodi:docname="fixme_annotation.svg">
    1919  <defs
    2020     id="defs4" />
     
    2626     inkscape:pageopacity="0.0"
    2727     inkscape:pageshadow="2"
    28      inkscape:zoom="31.678384"
    29      inkscape:cx="10.322295"
    30      inkscape:cy="18.469253"
     28     inkscape:zoom="18.090625"
     29     inkscape:cx="3.7830558"
     30     inkscape:cy="14.850462"
    3131     inkscape:document-units="px"
    3232     inkscape:current-layer="layer1"
     
    3434     units="px"
    3535     inkscape:window-width="1680"
    36      inkscape:window-height="988"
     36     inkscape:window-height="987"
    3737     inkscape:window-x="-8"
    3838     inkscape:window-y="-8"
     
    101101       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"
    102102       id="rect4140"
    103        width="3"
    104        height="1"
    105        x="18"
     103       width="4"
     104       height="0.9999826"
     105       x="17"
    106106       y="1030.3622" />
    107107    <rect
    108108       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"
    109109       id="rect4142"
    110        width="2"
    111        height="1.0001045"
    112        x="18"
     110       width="3"
     111       height="1.0001047"
     112       x="17"
    113113       y="1033.3622" />
    114114  </g>
Note: See TracChangeset for help on using the changeset viewer.