Changes between Version 35 and Version 36 of Presets/MastAndTower

Timestamp:

2021-10-11T15:13:48+02:00 (4 years ago)

Author:

skyper

Comment:

Finally, got rid of two preset links being presented.

Presets/MastAndTower

@@ -24 +24 @@
 
 == Notes
-* The two general presets should be excluded from preset links from [wikitr:/Help/Dialog/TagsMembership Tags/Memberships panel] if [osmwiki:Key:tower:type tower:type=*] is present but this is not implemented, see #19012 and #20843.
+* Some new `tower:type` could be added
 
 ==  Help needed
@@ -44 +44 @@
          de.description="Fügt eine vollständige Objektvorlage für alle Arten von Masten und Türmen hinzu. "
          author="skyper"
-         version="0.2.[[revision]]_[[date]]"> 
+         version="0.3.[[revision]]_[[date]]"> 
 
     <!-- chunks -->
@@ -54 +54 @@
         <combo key="access" text="General access" values="yes,private,permissive,customers,no" values_sort="false" />
     </chunk>
-
     <chunk id="addr_contact">
         <preset_link preset_name="Address" />
         <preset_link preset_name="Contact (Schema with 'contact:*' Prefix)" />
     </chunk>
-    
     <chunk id="name_ref_extra">
         <text key="name" text="Name" />
@@ -65 +63 @@
         <reference ref="extra" />
     </chunk>
-
     <chunk id="name_ref_extra_contact">
         <reference ref="name_ref_extra" />
         <reference ref="addr_contact" />
     </chunk>
-
     <chunk id="extra2_tw">
         <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_sort="false" />
@@ -77 +73 @@
         <reference ref="addr_contact" />
     </chunk>
-
     <chunk id="detail_tw">
         <optional>
@@ -84 +79 @@
         </optional>
     </chunk>
-
     <chunk id="tw_con_tw">
         <combo key="tower:construction" text="Type of construction" values_sort="false" values_searchable="true">
@@ -93 +87 @@
         </combo>
     </chunk>
-
     <chunk id="tw_con_tw_com">
         <combo key="tower:construction" text="Type of construction" values_sort="false" values_searchable="true">
@@ -102 +95 @@
         </combo>
     </chunk>
-
     <chunk id="tw_con_mt">
         <combo key="tower:construction" text="Type of construction" values_sort="false" values_searchable="true">
@@ -111 +103 @@
         </combo>
     </chunk>
-
     <chunk id="tech">
         <multiselect key="technology" text="Technology" values="LTE;UMTS;GSM 900;GSM 1800" values_sort="false" rows="4" />
@@ -124 +115 @@
         </checkgroup>
     </chunk>
-
     <chunk id="frequency">
         <text key="frequency" text="Frequency" />
     </chunk>
-
     <chunk id="name_ref_tech_extra">
         <reference ref="tech" />
@@ -134 +123 @@
         <reference ref="name_ref_extra"/>
     </chunk>
-
     <chunk id="link_mast">
         <preset_link preset_name="General preset Mast" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     </chunk>
-
     <chunk id="link_tower">
         <preset_link preset_name="General preset Tower" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     </chunk>
-
     <chunk id="link_com_mast">
         <preset_link preset_name="Communication mast" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     </chunk>
-
     <chunk id="link_antenna">
         <preset_link preset_name="Antenna " text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     </chunk>
-
     <chunk id="link_telescope">
         <preset_link preset_name="Telescope" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
@@ -157 +141 @@
     <!-- groups -->
     <group name="Mast and Tower" icon="presets/tower/tower.svg">
-
         <item name="Antenna " icon="presets/tower/antenna.svg" type="node" preset_name_label="true">
             <link wiki="Tag:man_made=antenna" />
@@ -169 +152 @@
             </optional>
         </item>
-
         <group name="Mast" icon="presets/tower/mast.svg">
-
-            <item name="General preset Mast" icon="presets/tower/mast.svg" type="node" preset_name_label="true">
+            <item name="General preset Mast" icon="presets/tower/mast.svg" type="node" preset_name_label="true" match_expression="man_made=mast -&quot;tower:type&quot;=communication -&quot;tower:type&quot;=lighting -&quot;tower:type&quot;=monitoring -&quot;tower:type&quot;=observation -&quot;tower:type&quot;=radar -&quot;tower:type&quot;=siren">
                 <link wiki="Tag:man_made=mast" />
                 <space />
@@ -194 +175 @@
                 </optional>
             </item>
-
             <separator />
-
             <item name="Communication mast" icon="presets/tower/mast_communication.svg" type="node" preset_name_label="true">
                 <link wiki="Tag:tower:type=communication" />
@@ -212 +191 @@
                 </optional>
             </item>
-
             <item name="Lighting mast" icon="presets/tower/mast_lighting.svg" type="node" preset_name_label="true">
                 <link wiki="Tag:tower:type=lighting" />
@@ -223 +201 @@
                 </optional>
             </item>
-
             <item name="Monitoring mast" icon="High-contrast-utilities-system-monitor.svg" type="node" preset_name_label="true">
                 <link wiki="Tag:tower:type=monitoring" />
@@ -236 +213 @@
                 <reference ref="addr_contact" />
             </item>
-
+            <item name="Observation mast" icon="presets/tower/observation.svg" type="node" preset_name_label="true"> <!-- FIXME: own icon -->
+                <link wiki="Tag:tower:type=observation" />
+                <space />
+                <key key="man_made" value="mast" />
+                <key key="tower:type" value="observation" />
+                <reference ref="tw_con_mt" />
+                <optional>
+                    <reference ref="name_ref_extra_contact" />
+                </optional>
+            </item>
             <item name="Radar mast" icon="tower_dish.svg" type="node" preset_name_label="true">
                 <link wiki="Tag:tower:type=radar" />
@@ -251 +237 @@
                 </optional>
             </item>
-
             <item name="Siren mast" icon="presets/emergency/siren.svg" type="node" preset_name_label="true">
                 <link wiki="Tag:tower:type=siren" />
@@ -264 +249 @@
                 <reference ref="addr_contact" />
             </item>
-    
-        </group>
+        </group> <!-- Mast -->
         <group name="Tower" icon="presets/tower/tower.svg">
-
-            <item name="General preset Tower" icon="presets/tower/tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="General preset Tower" icon="presets/tower/tower.svg" type="node,closedway,multipolygon" preset_name_label="true" match_expression="man_made=tower -&quot;tower:type&quot;=bell_tower -&quot;tower:type&quot;=communication -&quot;tower:type&quot;=cooling -&quot;tower:type&quot;=defensive -&quot;tower:type&quot;=lighting -&quot;tower:type&quot;=minaret -&quot;tower:type&quot;=monitoring -&quot;tower:type&quot;=observation -&quot;tower:type&quot;=radar -&quot;tower:type&quot;=watchtower">
                 <link wiki="Tag:man_made=tower" />
                 <space />
@@ -294 +277 @@
                 <reference ref="detail_tw" />
             </item>
-
             <separator />
-
             <item name="Big communication tower" icon="presets/tower/communications_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:man_made=communications_tower" />
@@ -314 +295 @@
                 </optional>
             </item>
-
             <item name="Small communication tower" icon="presets/tower/communication.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:tower:type=communication" />
@@ -329 +309 @@
                 </optional>
             </item>
-
             <item name="Radar tower" icon="tower_dish.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:tower:type=radar" />
@@ -340 +319 @@
                 <reference ref="detail_tw" />
             </item>
-
             <item name="Lighting tower" icon="presets/tower/lighting.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:tower:type=lighting" />
@@ -349 +327 @@
                 <reference ref="detail_tw" />
             </item>
-
             <item name="Cooling tower" icon="presets/tower/cooling.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:tower:type=cooling" />
                 <space />
-                <preset_link preset_name="Chimney" text="Similar but different tag: " text_context="man_made=chimney;man_made=tower,tower:type=cooling" />
+                <preset_link preset_name="Chimney" text="Similar but different tag:" text_context="man_made=chimney;man_made=tower,tower:type=cooling" />
                 <space />
                 <key key="man_made" value="tower" />
@@ -360 +337 @@
                 <reference ref="detail_tw" />
             </item>
-
             <item name="Water tower" icon="presets/tower/water_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:man_made=water_tower" />
@@ -371 +347 @@
                 </optional>
             </item>
-
             <item name="Monitoring tower" icon="High-contrast-utilities-system-monitor.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:tower:type=monitoring" />
@@ -381 +356 @@
                 <reference ref="detail_tw" />
             </item>
-
             <item name="Observation tower" icon="presets/tower/observation.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:tower:type=observation" />
@@ -390 +364 @@
                 <reference ref="detail_tw" />
             </item>
-
             <item name="Watch tower" icon="presets/tower/observation.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:tower:type=watchtower" />
@@ -398 +371 @@
                 <reference ref="detail_tw" />
             </item>
-
             <item name="Defensive tower" icon="presets/tower/defensive.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:tower:type=defensive" />
@@ -406 +378 @@
                 <reference ref="detail_tw" />
             </item>
-
             <item name="Bell tower" icon="presets/tower/bell_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:tower:type=bell_tower" />
@@ -418 +389 @@
                 </optional>
             </item>
-
             <item name="Minaret" icon="Mosque.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:tower:type=minaret" />
@@ -426 +396 @@
                 <reference ref="detail_tw" />
             </item>
-
-        </group>
-    </group>
+        </group> <!-- Tower -->
+    </group> <!-- Mast and Tower -->
 </presets>
 }}}