Changeset 12417 in josm

Timestamp:

2017-06-20T20:23:33+02:00 (8 years ago)

Author:

Klumbumbus

Message:

fix #14417 - add airmark=beacon and ​aeroway=navigationaid and improve icon of ​man_made=beacon (icons self created, plane from terminal icon, all CC0 and PD licensed)

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• images/presets/landmark/beacon.svg (added)
• images/presets/transport/airport/airmark_beacon.svg (added)
• images/presets/transport/airport/navigationaid.svg (added)
• images_nodist/presets/beacon.svg (copied) (copied from trunk/images/presets/landmark/beacon.svg )
• styles/standard/elemstyles.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -3777 +3777 @@
             <combo key="building" text="Building" values="hangar,yes" values_context="building" default="hangar" values_searchable="true" />
         </item> <!-- Hangar -->
-        <item name="Beacon" icon="presets/landmark/beacon.svg" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
-                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=beacon"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=beacon"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=beacon"
-                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:man_made=beacon"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
-            <key key="man_made" value="beacon" />
+        <item name="Beacon" icon="presets/transport/airport/airmark_beacon.svg" name_context="airmark" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:airmark=beacon"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:airmark=beacon"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:airmark=beacon" />
+            <key key="airmark" value="beacon" />
         </item> <!-- Beacon -->
+        <item name="Navigationaid" icon="presets/transport/airport/navigationaid.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=navigationaid"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:aeroway=navigationaid"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=navigationaid"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=navigationaid" />
+            <key key="aeroway" value="navigationaid" />
+        </item> <!-- Navigationaid -->
         <item name="Windsock" icon="presets/transport/airport/windsock.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock"
@@ -7063 +7067 @@
             <text key="name" text="Name" />
         </item> <!-- Lighthouse -->
-        <item name="Beacon" icon="presets/landmark/beacon.svg" type="node,closedway" preset_name_label="true">
+        <item name="Beacon" icon="presets/landmark/beacon.svg" name_context="man_made" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"

trunk/styles/standard/elemstyles.mapcss

@@ -3597 +3597 @@
     set icon_z17;
 }
+node[airmark=beacon] {
+    icon-image: "presets/transport/airport/airmark_beacon.svg";
+    set icon_z17;
+}
+node[aeroway=navigationaid] {
+    icon-image: "presets/transport/airport/navigationaid.svg";
+    set icon_z17;
+}
 node[aeroway=windsock] {
     icon-image: "presets/transport/airport/windsock.svg";