Changeset 17468 in josm


Ignore:
Timestamp:
2021-01-18T14:54:18+01:00 (3 months ago)
Author:
Klumbumbus
Message:

fix #20338 - Deprecate amenity=embassy in favor of office=diplomatic (icon derived from office=government and amenity=embassy icons, PD and CC0 licensed)

Location:
trunk
Files:
1 added
4 edited
1 moved

Legend:

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

    r17466 r17468  
    40994099            <preset_link preset_name="Building" />
    41004100        </item> <!-- Community Centre -->
    4101         <item name="Embassy" icon="presets/service/embassy.svg" type="node,closedway,multipolygon" preset_name_label="true">
    4102             <link wiki="Tag:amenity=embassy" />
    4103             <space />
    4104             <key key="amenity" value="embassy" />
    4105             <reference ref="name_oh_wheelchair" />
    4106             <reference ref="link_contact_address" />
    4107         </item> <!-- Embassy -->
    41084101        <item name="Courthouse" icon="presets/service/courthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
    41094102            <link wiki="Tag:amenity=courthouse" />
     
    74737466        <reference ref="link_contact_address" />
    74747467    </item> <!-- Private company -->
     7468    <item name="Diplomatic" icon="presets/office/diplomatic.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
     7469        <link wiki="Tag:office=diplomatic" />
     7470        <space />
     7471        <key key="office" value="diplomatic" />
     7472        <text key="name" text="Name" />
     7473        <combo key="diplomatic" text="Type" values="consulate,embassy,liaison" />
     7474        <reference ref="oh_wheelchair" />
     7475        <reference ref="link_contact_address" />
     7476    </item> <!-- Diplomatic -->
    74757477    <item name="Educational institution" icon="presets/office/educational_institution.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
    74767478        <link wiki="Tag:office=educational_institution" />
  • trunk/resources/data/validator/deprecated.mapcss

    r17466 r17468  
    22462246}
    22472247
     2248/* #20338 */
     2249*[amenity=embassy] {
     2250  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2251  suggestAlternative: "office=diplomatic + diplomatic=embassy";
     2252  group: tr("deprecated tagging");
     2253  fixAdd: "office=diplomatic";
     2254  fixChangeKey: "amenity => diplomatic";
     2255}
     2256
    22482257/* When tags are deprecated they should be added to ignoretags.cfg too. */
  • trunk/resources/data/validator/ignoretags.cfg

    r17467 r17468  
    702702E:kp
    703703E:pk
     704K:amenity=embassy
    704705;
    705706; Tags not yet decided (to remove from this section when added or moved up when deprecated)
  • trunk/resources/styles/standard/elemstyles.mapcss

    r17258 r17468  
    17361736area[office=association],
    17371737area[office=company],
     1738area[office=diplomatic],
    17381739area[office=educational_institution],
    17391740area[office=employment_agency],
     
    17721773node[office=company] {
    17731774    icon-image: "presets/office/private_company.svg";
     1775    set icon_z17;
     1776}
     1777node[office=diplomatic] {
     1778    icon-image: "presets/office/diplomatic.svg";
    17741779    set icon_z17;
    17751780}
     
    29862991}
    29872992area[amenity=townhall],
    2988 area[amenity=embassy],
    29892993area[amenity=community_centre] {
    29902994    fill-color: amenity_light#f7efb7;
     
    29922996node[amenity=townhall] {
    29932997    icon-image: "presets/service/townhall.svg";
    2994     set icon_z17;
    2995 }
    2996 node[amenity=embassy] {
    2997     icon-image: "presets/service/embassy.svg";
    29982998    set icon_z17;
    29992999}
Note: See TracChangeset for help on using the changeset viewer.