Changeset 17468 in josm

Timestamp:

2021-01-18T14:54:18+01:00 (4 years 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:

• nodist/images/presets/embassy.svg (moved) (moved from trunk/resources/images/presets/service/embassy.svg )
• resources/data/defaultpresets.xml (modified) (2 diffs)
• resources/data/validator/deprecated.mapcss (modified) (1 diff)
• resources/data/validator/ignoretags.cfg (modified) (1 diff)
• resources/images/presets/office/diplomatic.svg (added)
• resources/styles/standard/elemstyles.mapcss (modified) (4 diffs)

trunk/resources/data/defaultpresets.xml

@@ -4099 +4099 @@
             <preset_link preset_name="Building" />
         </item> <!-- Community Centre -->
-        <item name="Embassy" icon="presets/service/embassy.svg" type="node,closedway,multipolygon" preset_name_label="true">
-            <link wiki="Tag:amenity=embassy" />
-            <space />
-            <key key="amenity" value="embassy" />
-            <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address" />
-        </item> <!-- Embassy -->
         <item name="Courthouse" icon="presets/service/courthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=courthouse" />
@@ -7473 +7466 @@
         <reference ref="link_contact_address" />
     </item> <!-- Private company -->
+    <item name="Diplomatic" icon="presets/office/diplomatic.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+        <link wiki="Tag:office=diplomatic" />
+        <space />
+        <key key="office" value="diplomatic" />
+        <text key="name" text="Name" />
+        <combo key="diplomatic" text="Type" values="consulate,embassy,liaison" />
+        <reference ref="oh_wheelchair" />
+        <reference ref="link_contact_address" />
+    </item> <!-- Diplomatic -->
     <item name="Educational institution" icon="presets/office/educational_institution.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:office=educational_institution" />

trunk/resources/data/validator/deprecated.mapcss

@@ -2246 +2246 @@
 }
 
+/* #20338 */
+*[amenity=embassy] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "office=diplomatic + diplomatic=embassy";
+  group: tr("deprecated tagging");
+  fixAdd: "office=diplomatic";
+  fixChangeKey: "amenity => diplomatic";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */

trunk/resources/data/validator/ignoretags.cfg

@@ -702 +702 @@
 E:kp
 E:pk
+K:amenity=embassy
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated) 

trunk/resources/styles/standard/elemstyles.mapcss

@@ -1736 +1736 @@
 area[office=association],
 area[office=company],
+area[office=diplomatic],
 area[office=educational_institution],
 area[office=employment_agency],
@@ -1772 +1773 @@
 node[office=company] {
     icon-image: "presets/office/private_company.svg";
+    set icon_z17;
+}
+node[office=diplomatic] {
+    icon-image: "presets/office/diplomatic.svg";
     set icon_z17;
 }
@@ -2986 +2991 @@
 }
 area[amenity=townhall],
-area[amenity=embassy],
 area[amenity=community_centre] {
     fill-color: amenity_light#f7efb7;
@@ -2992 +2996 @@
 node[amenity=townhall] {
     icon-image: "presets/service/townhall.svg";
-    set icon_z17;
-}
-node[amenity=embassy] {
-    icon-image: "presets/service/embassy.svg";
     set icon_z17;
 }