Ticket #22561: 22561.patch

File 22561.patch, 3.6 KB (added by taylor.smock, 3 years ago)

  • resources/data/validator/combinations.mapcss 

    Subject: [PATCH] Fix #22561: change site_type to archaeological_site
---
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/validator/combinations.mapcss b/resources/data/validator/combinations.mapcss
    a b  
    106106*[shelter_type                 ][amenity!=shelter],
    107107node[lamp_type                 ][highway!=street_lamp],
    108108node[map_type                  ][information!=map],
    109 *[site_type                    ][historic!=archaeological_site],
     109*[archaeological_site          ][historic!=archaeological_site],
    110110*[artwork_type                 ][tourism!=artwork][exhibit!=artwork],
    111111*[castle_type                  ][historic!=castle],
    112112*[parking                      ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/][parking!=yes][parking!=no],

  • resources/data/validator/deprecated.mapcss 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/validator/deprecated.mapcss b/resources/data/validator/deprecated.mapcss
    a b  
    24012401  group: tr("deprecated tagging");
    24022402}
    24032403
    2404 /* temporary URLs, can be exteded to other websites and other keys e.g. "url" or "website", #22397 */
     2404/* temporary URLs, can be extended to other websites and other keys e.g. "url" or "website", #22397 */
    24052405*[image][image=~/^https:\/\/westnordost.de\/p\//] {
    24062406  throwWarning: tr("{0} with a temporary URL which may be outdated very soon", "{0.key}");
    24072407  fixRemove: "{0.key}";
    … …  
    24102410  assertNoMatch: "node image=https://commons.wikimedia.org/wiki/File:2015-05-13_Basteibr%C3%BCcke-.jpg";
    24112411}
    24122412
     2413/* Replaced by archaeological_site */
     2414*[historic=archaeological_site][site_type] {
     2415  throwWarning: tr("{0} should be replaced with {1}", "{0.key}", "{1.key}");
     2416  fixChangeKey: "site_type => archaeological_site";
     2417  assertMatch: "node historic=archaeological_site site_type=fortification";
     2418  assertNoMatch: "node historic=archaeological_site site_type2=fortification";
     2419}
     2420
    24132421/* When tags are deprecated they should be added to ignoretags.cfg too. */

  • resources/data/defaultpresets.xml 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
    a b  
    69816981            <link wiki="Tag:historic=archaeological_site" />
    69826982            <space />
    69836983            <key key="historic" value="archaeological_site" />
    6984             <combo key="site_type" text="Type" values="tumulus,megalith,fortification,settlement,necropolis,city" />
     6984            <combo key="archaeological_site" text="Type" values="catacombs,city,fortification,geoglyph,petroglyph,hut_circle,megalith,necropolis,roman_circus,roman_theater,roman_villa,settlement,tumulus" />
    69856985            <reference ref="name_oh_wheelchair" />
    69866986        </item> <!-- Archaeological Site -->
    69876987        <item name="Battlefield" icon="presets/sightseeing/battlefield.svg" type="node,closedway,multipolygon" preset_name_label="true">