Update default preset and taginfo project files

MarcusWolschon · Dec 4, 2024 · d9816dc · d9816dc
1 parent 71c1120
commit d9816dc
Show file tree

Hide file tree

Showing 6 changed files with 397 additions and 207 deletions.
diff --git a/src/main/assets/images/icons/png/amenity_advertising_totem.png b/src/main/assets/images/icons/png/amenity_advertising_totem.png
diff --git a/src/main/assets/images/icons/png/tourist_information_tactile_map_20006.png b/src/main/assets/images/icons/png/tourist_information_tactile_map_20006.png
diff --git a/src/main/assets/images/icons/png/tourist_information_tactile_model_20007.png b/src/main/assets/images/icons/png/tourist_information_tactile_model_20007.png
diff --git a/src/main/assets/preset.xml b/src/main/assets/preset.xml
@@ -1867,13 +1867,19 @@
             <check key="bicycle" text="By bicycle" disable_off="true"/>
         </checkgroup>
     </chunk>
+    <chunk id="facility_visibility">
+        <combo key="visibility" text="Visibility" values="house,street,area" display_values="House (up to 5m),Street (up to 20m),Area (more than 20m)"/>
+    </chunk>
     <chunk id="advertising_optional">
         <optional>
             <check key="lit" text="Lit" disable_off="true"/>
             <check key="luminous" text="Luminous" disable_off="true"/>
             <combo key="animated" text="Animation" values="no,yes,trivision_blades,winding_posters,revolving,screen,digital_messages,digital_prices,wind" display_values="No,Yes,Trivision blades,Winding posters,Revolving,Screen,Digital messages,Digital prices,Wind" values_context="advertising" values_searchable="true" match="key"/>
             <text key="height" text="Height (Meters)" value_type="dimension_vertical"/>
             <combo key="sides" text="Number of sides" length="3" values="1,2,3,4,5,6" values_sort="false" match="none" editable="true" value_type="integer"/>
+            <combo key="direction" text="Facing" values="N,E,S,W,0,90,180,270" display_values="North,East,South,West,0&#xB0;,90&#xB0;,180&#xB0;,270&#xB0;" values_sort="false" match="key" value_type="cardinal_direction"/>
+            <combo key="orientation" text="Orientation" values="front,medium,parallel,opposite,multi" display_values="Front,Medium,Parallel,Opposite,Multi"/>
+            <reference ref="facility_visibility"/>
             <reference ref="support"/>
         </optional>
     </chunk>
@@ -2176,12 +2182,24 @@
     <chunk id="trailblazed">
         <combo key="trailblazed" text="Trail markings" values="yes,poles,cairns,symbols,no" display_values="Yes,Poles,Cairns,Symbols,No" match="key"/>
     </chunk>
-    <chunk id="facility_visibility">
-        <combo key="visibility" text="Visibility" values="house,street,area" display_values="House (up to 5m),Street (up to 20m),Area (more than 20m)"/>
-    </chunk>
     <chunk id="aerialway_usage">
         <multiselect key="usage" text="Usage" values="industrial;freight;tourism" display_values="Freight;Industrial;Tourism" values_context="usage" values_searchable="true"/>
     </chunk>
+    <chunk id="map_base">
+        <reference ref="optional_name_ref_operator"/>
+        <combo key="map_type" text="Detail Grade" values="topo,street,scheme,toposcope" display_values="Topo,Street,Scheme,Toposcope"/>
+        <combo key="map_size" text="Shown Area" values="site,city,region" display_values="Site,City,Region" values_sort="false"/>
+        <text key="description" text="Detailed description" length="255"/>
+        <optional text="Routes shown for:">
+            <check key="hiking" text="Hiking" disable_off="true"/>
+            <check key="bicycle" text="Cycling" disable_off="true"/>
+            <check key="mtb" text="Mountainbiking" disable_off="true"/>
+            <check key="ski" text="Skiing" disable_off="true"/>
+            <check key="horse" text="Riding" disable_off="true"/>
+            <space/>
+            <label text="... other transportation modes possible"/>
+        </optional>
+    </chunk>
     <!-- Groups -->
     <group name="Highways" icon="icons/png/highway_highway_sp.png">
     <group name="Streets" icon="icons/png/highway_highway_sp.png" items_sort="false">
@@ -2700,25 +2718,30 @@
             <combo key="cycleway:lane" text="Bicycle lane type" values_context="cycleway" match="none">
                 <list_entry value="exclusive" display_value="Exclusive"/><list_entry value="advisory" display_value="Advisory"/><list_entry value="pictogram" display_value="Pictogram"/>
             </combo>
-            <!-- the following two items are SChisms that are forced on everybody -->
+            <check key="cycleway:buffer" text="Buffer between cars and cycleway" match="none"/>
+            <!-- the following two items are Schisms that are forced on everybody -->
             <combo key="cycleway:both" text="Cycleway" values_context="cycleway" match="none" deprecated="true">
                 <list_entry value="lane" display_value="Lane"/><list_entry value="track" display_value="Track"/><list_entry value="share_busway" display_value="Share busway"/><list_entry value="shared_lane" display_value="Shared lane"/><list_entry value="separate" display_value="Separate"/>
             </combo>
             <combo key="cycleway:both:lane" text="Bicycle lane type" values_context="cycleway" match="none" deprecated="true">
                 <list_entry value="exclusive" display_value="Exclusive"/><list_entry value="advisory" display_value="Advisory"/><list_entry value="pictogram" display_value="Pictogram"/>
             </combo>
+            <check key="cycleway:both:buffer" text="Buffer between cars and cycleway" match="none" deprecated="true"/>
+            <!-- -->
             <combo key="cycleway:left" text="Cycleway left" values_context="cycleway" match="none">
                 <list_entry value="lane" display_value="Lane"/><list_entry value="track" display_value="Track"/><list_entry value="share_busway" display_value="Share busway"/><list_entry value="shared_lane" display_value="Shared lane"/><list_entry value="separate" display_value="Separate"/>
             </combo>
             <combo key="cycleway:left:lane" text="Bicycle lane type left" values_context="cycleway" match="none">
                 <list_entry value="exclusive" display_value="Exclusive"/><list_entry value="advisory" display_value="Advisory"/><list_entry value="pictogram" display_value="Pictogram"/>
             </combo>
+            <check key="cycleway:left:buffer" text="Buffer between cars and left cycleway" match="none"/>
             <combo key="cycleway:right" text="Cycleway right" values_context="cycleway" match="none">
                 <list_entry value="lane" display_value="Lane"/><list_entry value="track" display_value="Track"/><list_entry value="share_busway" display_value="Share busway"/><list_entry value="shared_lane" display_value="Shared lane"/><list_entry value="separate" display_value="Separate"/>
             </combo>
             <combo key="cycleway:right:lane" text="Bicycle lane type right" values_context="cycleway" match="none">
                 <list_entry value="exclusive" display_value="Exclusive"/><list_entry value="advisory" display_value="Advisory"/><list_entry value="pictogram" display_value="Pictogram"/>
             </combo>
+            <check key="cycleway:right:buffer" text="Buffer between cars and right cycleway" match="none"/>
             <combo key="oneway:bicycle" text="Oneway (bicycle)" values_sort="false">
                 <list_entry value="yes" display_value="In way direction"/><list_entry value="-1" display_value="Against way direction"/><list_entry value="no" display_value="Not oneway"/>
             </combo>
@@ -3225,7 +3248,7 @@
             <checkgroup text="In case of traffic signals:" columns="2">  
                 <check key="button_operated" text="Button operated" disable_off="true"/>
                 <check key="traffic_signals:sound" text="Sound signals" disable_off="true"/>
-                <check key="traffic_signals:minimap" text="Tactile map" disable_off="true"/>
+                <check key="traffic_signals:minimap" text="Tactile mini map" disable_off="true"/>
             </checkgroup>
         </item> <!-- Pedestrian Crossing -->
         <group name="Traffic Calming" icon="icons/png/transport_speedbump.png">
@@ -6531,20 +6554,18 @@
             <space/>
             <key key="tourism" value="information"/>
             <key key="information" value="map"/>
-            <reference ref="optional_name_ref_operator"/>
-            <combo key="map_type" text="Detail Grade" values="topo,street,scheme,toposcope" display_values="Topo,Street,Scheme,Toposcope"/>
-            <combo key="map_size" text="Shown Area" values="site,city,region" display_values="Site,City,Region" values_sort="false"/>
-            <text key="description" text="Detailed description" length="255"/>
-            <optional text="Routes shown for:">
-                <check key="hiking" text="Hiking" disable_off="true"/>
-                <check key="bicycle" text="Cycling" disable_off="true"/>
-                <check key="mtb" text="Mountainbiking" disable_off="true"/>
-                <check key="ski" text="Skiing" disable_off="true"/>
-                <check key="horse" text="Riding" disable_off="true"/>
-                <space/>
-                <label text="... other transportation modes possible"/>
-            </optional>
+            <reference ref="map_base"/>
         </item> <!-- Map -->
+        <item name="Tactile map" icon="icons/png/tourist_information_tactile_map_20006.png" type="node" preset_name_label="true">
+            <link wiki="Tag:information=tactile_map"/>
+            <space/>
+            <label text="A tactile map."/>
+            <space/>
+            <key key="tourism" value="information"/>
+            <key key="information" value="tactile_map"/>
+            <reference ref="map_base"/>
+            <text key="blind:description" text="Description for visiually impaired" i18n="true"/>          
+        </item> <!-- Tactile map -->
         <item name="Information Board" icon="icons/png/tourist_information_board_20002.png" type="node" preset_name_label="true">
             <link wiki="Key:information=board"/>
             <space/>
@@ -6623,6 +6644,15 @@
             <label text="Audioguide via mobile phone?"/>
             <text key="phone" text="Phone number" value_type="phone"/>
         </item> <!-- Audio Guide -->
+        <item name="Tactile model" icon="icons/png/tourist_information_tactile_model_20007.png" type="node" preset_name_label="true">
+            <link wiki="Tag:information=tactile_model"/>
+            <space/>
+            <label text="A tactile model."/>
+            <space/>
+            <key key="tourism" value="information"/>
+            <key key="information" value="tactile_model"/>
+            <text key="blind:description" text="Description for visiually impaired" i18n="true"/>          
+        </item> <!-- Tactile model -->
         <item name="Other Information Point" icon="icons/png/tourist_information.png" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:tourism=information"/>
             <space/>
@@ -9065,30 +9095,7 @@
             <reference ref="fee"/>
         </item> <!-- Vacuum cleaner station -->
         <separator/>
-        <item name="Advertising" icon="icons/png/amenity_advertising_12451.png" type="node,closedway" preset_name_label="true">
-            <link wiki="Key:advertising"/>
-            <space/>
-            <combo key="advertising" text="Advertising facility" values="billboard,board,column,flag,poster_box,screen,sign,totem" display_values="Billboard,Board,Column,Flag,Poster box,Screen,Sign,Totem" values_context="advertising" values_searchable="true" match="key"/>
-            <reference ref="advertising_optional"/>
-        </item> <!-- Advertising -->
-        <item name="Advertising Column" icon="icons/png/amenity_advertising_column_12428.png" type="node,closedway" preset_name_label="true">
-            <link wiki="Tag:advertising=column"/>
-            <space/>
-            <key key="advertising" value="column"/>
-            <reference ref="advertising_optional"/>
-        </item> <!-- Advertising Column -->
-        <item name="Billboard" icon="icons/png/amenity_advertising_billboard_12427.png" type="node" preset_name_label="true">
-            <link wiki="Tag:advertising=billboard"/>
-            <space/>
-            <key key="advertising" value="billboard"/>
-            <reference ref="advertising_optional"/>
-        </item> <!-- Billboard -->
-        <item name="Poster box" icon="icons/png/amenity_advertising_poster_box_12441.png" type="node,way" preset_name_label="true">
-            <link wiki="Tag:advertising=poster_box"/>
-            <space/>
-            <key key="advertising" value="poster_box"/>
-            <reference ref="advertising_optional"/>
-        </item> <!-- Poster box -->
+
         <item name="Excrement Bags" icon="icons/png/amenity_vending_excrement_bags_12290.png" type="node" preset_name_label="true">
             <link wiki="Tag:amenity=vending_machine%3Dexcrement_bags"/>
             <space/>
@@ -9128,7 +9135,44 @@
             <reference ref="name_operator"/>
             <reference ref="link_contact_address"/>
         </item> <!-- Research institute -->
-    </group> <!-- Facilities -->
+        </group> <!-- Facilities -->
+           <group name="Advertising" icon="icons/png/amenity_advertising_12451.png">
+            <item name="Advertising" icon="icons/png/amenity_advertising_12451.png" type="node,closedway" preset_name_label="true">
+                <link wiki="Key:advertising"/>
+                <space/>
+                <combo key="advertising" text="Advertising facility" values="billboard,board,column,flag,poster_box,screen,sign,totem" display_values="Billboard,Board,Column,Flag,Poster box,Screen,Sign,Totem" values_context="advertising" values_searchable="true" match="key"/>
+                <reference ref="advertising_optional"/>
+            </item> <!-- Advertising -->
+            <item name="Advertising Column" icon="icons/png/amenity_advertising_column_12428.png" type="node,closedway" preset_name_label="true">
+                <link wiki="Tag:advertising=column"/>
+                <space/>
+                <key key="advertising" value="column"/>
+                <reference ref="advertising_optional"/>
+            </item> <!-- Advertising Column -->
+            <item name="Billboard" icon="icons/png/amenity_advertising_billboard_12427.png" type="node" preset_name_label="true">
+                <link wiki="Tag:advertising=billboard"/>
+                <space/>
+                <key key="advertising" value="billboard"/>
+                <reference ref="advertising_optional"/>
+            </item> <!-- Billboard -->
+            <item name="Poster box" icon="icons/png/amenity_advertising_poster_box_12441.png" type="node,way" preset_name_label="true">
+                <link wiki="Tag:advertising=poster_box"/>
+                <space/>
+                <key key="advertising" value="poster_box"/>
+                <reference ref="advertising_optional"/>
+            </item> <!-- Poster box -->
+            <item name="Totem" icon="icons/png/amenity_advertising_totem.png" type="node,way" preset_name_label="true">
+                <link wiki="Tag:advertising=totem"/>
+                <space/>
+                <key key="advertising" value="totem"/>
+                <combo key="message" text="Message type" values="commercial,local,safety,legal,map,political,showbiz,non_profit,opinion,religion" display_values="Commercial,Local,Safety,Legal,Map,Political,Showbiz,Non profit,Opinion,Religion"/>
+                <optional>
+                    <reference ref="ref_operator"/>
+                    <reference ref="advertising_optional"/>
+                    <text key="width" text="Width (meters)"/>
+                </optional>
+            </item> <!-- Totem -->
+        </group> <!-- Advertising -->
     </group>  <!-- Facilities -->
     <group name="Sports" icon="icons/png/sport_soccer.png">
     <group name="Sport Facilities" icon="icons/png/sport_stadium.png">
@@ -11737,7 +11781,7 @@
                 <list_entry value="bench" display_value="Bench" short_description="A bench placed in memory of someone or something; usually has a plaque, and sometimes a statue sitting on (part of) it."/>
             </combo>
             <optional>
-                <text key="inscription" text="Inscription" length="255"/>
+                <text key="inscription" text="Inscription" multiline="true" length="255"/>
                 <text key="artist_name" text="Artist Name"/>
                 <text key="start_date" text="Start date"/>
                 <reference ref="material"/>
@@ -11752,7 +11796,7 @@
             <reference ref="optional_name"/>
             <reference ref="religious_catholic_christian"/>
             <text key="start_date" text="Start date"/>
-            <text key="inscription" text="Inscription" length="255"/>
+            <text key="inscription" text="Inscription" multiline="true" length="255"/>
             <reference ref="material"/>
             <reference ref="historic_optional"/>
         </item> <!-- Wayside Cross -->
@@ -11765,7 +11809,7 @@
             <check key="amenity" text="Place of worship" value_on="place_of_worship" disable_off="true"/>
             <check key="building" value_on="wayside_shrine" text="Wayside shrine building" values_context="building" disable_off="true" values_searchable="true" match="keyvalue"/>
             <text key="start_date" text="Start date"/>
-            <text key="inscription" text="Inscription" length="255"/>
+            <text key="inscription" text="Inscription" multiline="true" length="255"/>
             <reference ref="historic_optional"/>
             <optional>
                 <reference ref="additional_building_tags"/>
@@ -11783,7 +11827,7 @@
             <key key="historic" value="boundary_stone"/>
             <optional>
                 <text key="name" text="Name"/>
-                <text key="inscription" text="Inscription"/>
+                <text key="inscription" text="Inscription" multiline="true" length="255"/>
             </optional>
             <preset_link preset_name="Boundary Marker" text="Similar but different tags:" alternative="true"/>
         </item> <!-- Boundary Stone -->
@@ -11793,7 +11837,7 @@
             <key key="historic" value="milestone"/>
             <optional>
                 <text key="name" text="Name"/>
-                <text key="inscription" text="Inscription"/>
+                <text key="inscription" text="Inscription" multiline="true" length="255"/>
             </optional>
         </item> <!-- Milestone -->
         <item name="Pillory" icon="icons/png/tourist_empty.png" type="node,closedway" preset_name_label="true">
@@ -12593,7 +12637,7 @@
             <reference ref="link_contact_address_payment"/>
         </item> <!-- Sports -->
         <item name="Water sports" icon="icons/png/shopping_water_sports_29208.png" type="node,closedway,multipolygon" preset_name_label="true">
-            <link wiki="Key:shop"/>
+            <link wiki="Tag:shop=water_sports"/>
             <space/>
             <key key="shop" value="water_sports"/>
             <reference ref="name_oh_wheelchair_level"/>
@@ -13346,7 +13390,7 @@
             <key key="boundary" value="marker"/>
             <optional>
                 <reference ref="name_ref"/>
-                <text key="inscription" text="Inscription"/>
+                <text key="inscription" text="Inscription" multiline="true" length="255"/>
                 <reference ref="material"/>
             </optional>
             <preset_link preset_name="Boundary Stone" text="Similar but different tags:" alternative="true"/>

diff --git a/taginfo-style.json b/taginfo-style.json
@@ -17,10 +17,10 @@
 {"description":"Data rendering","key": "addr:interpolation","object_types": ["way"]},
 {"description":"Data rendering","key": "aerialway","object_types": ["way"]},
 {"description":"Data rendering","key": "aeroway","object_types": ["way"]},
-{"description":"Data rendering","key": "amenity","object_types": ["way"]},
-{"description":"Data rendering","key": "amenity","value": "bicycle_parking","object_types": ["way"]},
-{"description":"Data rendering","key": "amenity","value": "motorcycle_parking","object_types": ["way"]},
-{"description":"Data rendering","key": "amenity","value": "parking","object_types": ["way"]},
+{"description":"Data rendering","key": "amenity","object_types": ["relation","way"]},
+{"description":"Data rendering","key": "amenity","value": "bicycle_parking","object_types": ["relation","way"]},
+{"description":"Data rendering","key": "amenity","value": "motorcycle_parking","object_types": ["relation","way"]},
+{"description":"Data rendering","key": "amenity","value": "parking","object_types": ["relation","way"]},
 {"description":"Data rendering","key": "area","value": "yes","object_types": ["way"]},
 {"description":"Data rendering","key": "barrier","object_types": ["way"]},
 {"description":"Data rendering","key": "barrier","value": "city_wall","object_types": ["way"]},