Changeset 9093 in josm

Timestamp:

2015-12-07T17:48:13+01:00 (9 years ago)

Author:

Klumbumbus

Message:

see #12135 - remove seamark=buoy and add deprecated warning; fix icon size of railway=signal

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/validator/deprecated.mapcss (modified) (1 diff)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -2261 +2261 @@
             <key key="waterway" value="turning_point" />
         </item> <!-- Turning Point -->
-        <item name="Buoy" icon="styles/standard/nautical/buoy.svg" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:seamark=buoy" />
-            <key key="seamark" value="buoy" />
-        </item> <!-- Buoy -->
         <separator/>
         <item name="Slipway" icon="styles/standard/nautical/slipway.png" type="node,way" preset_name_label="true">

trunk/data/validator/deprecated.mapcss

@@ -564 +564 @@
   suggestAlternative: "landuse=farmyard";
 }
+
+/* #12135 comment:11 */
+*[seamark=buoy]["seamark:type"=~/^(buoy_cardinal|buoy_installation|buoy_isolated_danger|buoy_lateral|buoy_safe_water|buoy_special_purpose|mooring)$/] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "{1.tag}";
+  fixRemove: "seamark";
+}
+*[seamark=buoy]["seamark:type"!~/^(buoy_cardinal|buoy_installation|buoy_isolated_danger|buoy_lateral|buoy_safe_water|buoy_special_purpose|mooring)$/] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "{1.tag}";
+}

trunk/styles/standard/elemstyles.mapcss

@@ -3474 +3474 @@
 node[railway=signal] {
     icon-image: "vehicle/railway_signal.svg";
-    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -4226 +4225 @@
 node[waterway=turning_point] {
     icon-image: "nautical/turning.png";
-    set icon_z17;
-    text: auto;
-}
-node[seamark=buoy] {
-    icon-image: "nautical/buoy.svg";
     set icon_z17;
     text: auto;