Changes between Version 7 and Version 8 of Presets/MastAndTower

Timestamp:

2020-03-22T15:26:31+01:00 (6 years ago)

Author:

skyper

Comment:

fix, update icons

Presets/MastAndTower

@@ -12 +12 @@
 == Notes ==
 * Please, feel free to enhance and update the preset.
-* All icons are PD from the [osmwiki:].
- * Still needs some nice icons as vector graphic.
+* Icons in [attachment:MastTower_icons.zip​ MastTower_icons.zip] are PD from [osmwiki: wiki.openstreetmap.org].
+* Other icons from https://commons.wikimedia.org with different licenses. 
+* Still needs some nicer icons as vector graphic for minaret, monitoring and radar
 
 == Preset Code ==
+
 {{{
 #!preset
@@ -56 +58 @@
             <list_entry value="freestanding" display_value="freestanding" icon="Tower_freestanding.svg" />
             <list_entry value="lattice" display_value="lattice" icon="Tower_lattice.svg" />
+        </combo>
+    </chunk>
+
+    <chunk id="tw_con_tw_com">
+        <combo key="tower:construction" text="Construction" values_sort="false">
+            <list_entry value="dome" display_value="Dome" icon="Tower_dome.svg" />
+            <list_entry value="freestanding" display_value="freestanding" icon="Tower_cantilever_communication.svg" />
+            <list_entry value="lattice" display_value="lattice" icon="Tower_lattice_communication.svg" />
         </combo>
     </chunk>
@@ -97 +107 @@
                 <key key="man_made" value="mast" match="keyvalue!" />
                 <multiselect key="tower:type" text="Tower type" values_searchable="true" rows="7" match="keyvalue!">
-                    <list_entry value="communication" display_value="" icon="Mast_communication.svg" />
+                    <list_entry value="communication" display_value="Communication" icon="Mast_communications.svg" />
                     <list_entry value="lighting" display_value="Lighting" icon="Mast_lighting.svg" />
-                    <list_entry value="monitoring" display_value="Monitoring" />
+                    <list_entry value="monitoring" display_value="Monitoring" icon="High-contrast-utilities-system-monitor.svg" icon_size="16" />
                     <list_entry value="observation" display_value="Observation" icon="Tower_observation.svg" />
-                    <list_entry value="radar" display_value="Radar" />
+                    <list_entry value="radar" display_value="Radar" icon="Satellite_ground.svg" icon_size="16" />
                     <list_entry value="siren" display_value="Siren" icon="presets/emergency/siren.svg" />
                 </multiselect>
@@ -138 +148 @@
             </item>
 
-            <item name="Monitoring mast"  type="node">
+            <item name="Monitoring mast" icon="High-contrast-utilities-system-monitor.svg" type="node">
                 <link wiki="Tag:tower:type=monitoring" />
                 <label text="Adding a monitoring mast" />
@@ -151 +161 @@
             </item>
 
-            <item name="Radar mast"  type="node">
+            <item name="Radar mast" icon="Satellite_ground.svg" type="node">
                 <link wiki="Tag:tower:type=radar" />
                 <label text="Adding a radar mast" />
@@ -163 +173 @@
             </item>
 
-            <item name="Siren mast"  type="node" icon="presets/emergency/siren.svg">
+            <item name="Siren mast" icon="presets/emergency/siren.svg" type="node">
                 <link wiki="Tag:tower:type=siren" />
                 <label text="Adding a siren mast" />
@@ -191 +201 @@
                     <list_entry value="lighting" display_value="Lighting tower" icon="Tower_lighting.svg" />
                     <list_entry value="minaret" display_value="Minaret" icon="Mosque.svg" icon_size="16" />
-                    <list_entry value="monitoring" display_value="Monitoring tower"  />
+                    <list_entry value="monitoring" display_value="Monitoring tower" icon="High-contrast-utilities-system-monitor.svg" icon_size="16" />
                     <list_entry value="observation" display_value="Observation tower" icon="Tower_observation.svg" />
-                    <list_entry value="radar" display_value="Radar tower"  />
+                    <list_entry value="radar" display_value="Radar tower" icon="Satellite_ground.svg" icon_size="16" />
                     <list_entry value="watchtower" display_value="Watch tower" icon="Tower_observation.svg" />
                 </multiselect>
@@ -216 +226 @@
                              editable="false" rows="2" />
                 <optional>
-                    <reference ref="tw_con_tw" />
+                    <reference ref="tw_con_tw_com" />
                     <reference ref="name_ref_tech_extra" />
                     <check key="fee" text="Fee" />
@@ -229 +239 @@
                 <key key="tower:type" value="communication" match="keyvalue!" />
                 <optional>
-                    <reference ref="tw_con_tw" />
+                    <reference ref="tw_con_tw_com" />
                     <reference ref="name_ref_tech_extra" />
                 </optional>
             </item>
 
-            <item name="Radar tower"  type="node,closedway,multipolygon">
+            <item name="Radar tower" icon="Satellite_ground.svg" type="node,closedway,multipolygon">
                 <link wiki="Tag:tower:type=radar" />
                 <label text="Adding a radar tower" />
@@ -282 +292 @@
             </item>
 
-            <item name="Monitoring tower"  type="node,closedway,multipolygon">
+            <item name="Monitoring tower" icon="High-contrast-utilities-system-monitor.svg" type="node,closedway,multipolygon">
                 <link wiki="Tag:tower:type=monitoring" />
                 <label text="Adding a monitoring tower" />
@@ -340 +350 @@
             </item>
 
-            <item name="Minaret"  type="node,closedway,multipolygon" icon="Mosque.svg">
+            <item name="Minaret" icon="Mosque.svg" type="node,closedway,multipolygon">
                 <link wiki="Tag:tower:type=minaret" />
                 <label text="Adding a minaret"/>