Changeset 16706 in josm for trunk/resources/styles

Timestamp:

2020-06-22T20:01:53+02:00 (4 years ago)

Author:

Klumbumbus

Message:

see #10759, see #17818, see #16898 - Add Presets for man_made=mast and man_made=communications_tower, rework preset for man_made=tower, based on patch by skyper, (all icons from ​https://wiki.openstreetmap.org/, from Geozeisig, all PD and CC0 licensed)

File:

• trunk/resources/styles/standard/elemstyles.mapcss (modified) (4 diffs)

trunk/resources/styles/standard/elemstyles.mapcss

@@ -1540 +1540 @@
 }
 area[man_made=reservoir_covered],
-area[man_made=tower],
 area[man_made=wastewater_plant],
 area[man_made=watermill],
-area[man_made=water_tower],
 area[man_made=water_well],
 area[man_made=windmill],
@@ -1562 +1560 @@
     set icon_z17;
 }
-node[man_made=tower] {
-    icon-image: "presets/landmark/tower.svg";
-    set icon_z17;
-}
 node[man_made=wastewater_plant] {
     icon-image: "presets/landmark/wastewater_plant.svg";
@@ -1572 +1566 @@
 node[man_made=watermill] {
     icon-image: "presets/landmark/watermill.svg";
-    set icon_z17;
-}
-node[man_made=water_tower] {
-    icon-image: "presets/landmark/water_tower.svg";
     set icon_z17;
 }
@@ -1603 +1593 @@
 node[man_made=cutline] {
     icon-image: "presets/misc/deprecated.svg";
+    set icon_z17;
+}
+
+area[man_made=water_tower],
+area[man_made=mast],
+area[man_made=tower],
+area[man_made=communications_tower] {
+    fill-color: manmade#d8d8d8;
+}
+node[man_made=water_tower] {
+    icon-image: "presets/tower/water_tower.svg";
+    set icon_z17;
+}
+node[man_made=mast] {
+    icon-image: "presets/tower/mast.svg";
+    set icon_z17;
+}
+node[man_made=mast][tower:type=communication] {
+    icon-image: "presets/tower/mast_communication.svg";
+    set icon_z17;
+}
+node[man_made=mast][tower:type=lighting] {
+    icon-image: "presets/tower/mast_lighting.svg";
+    set icon_z17;
+}
+node[man_made=tower] {
+    icon-image: "presets/tower/tower.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=bell_tower] {
+    icon-image: "presets/tower/bell_tower.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=communication] {
+    icon-image: "presets/tower/communication.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=cooling] {
+    icon-image: "presets/tower/cooling.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=defensive] {
+    icon-image: "presets/tower/defensive.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=lighting] {
+    icon-image: "presets/tower/lighting.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=observation] {
+    icon-image: "presets/tower/observation.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=watchtower] {
+    icon-image: "presets/tower/observation.svg";
+    set icon_z17;
+}
+node[man_made=communications_tower] {
+    icon-image: "presets/tower/communications_tower.svg";
     set icon_z17;
 }