Changeset 16245 in josm for trunk

Timestamp:

2020-04-08T18:20:25+02:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #18994 - Fine tune some presets object types and mappaint style (patch by skyper, modified), make values of key wall searchable

Location:

trunk/resources

Files:

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

trunk/resources/data/defaultpresets.xml

@@ -1420 +1420 @@
             <reference ref="optional_height" />
         </item> <!-- Guard Rail -->
-        <item name="Wall" icon="presets/barrier/wall.svg" type="way,closedway" preset_name_label="true">
+        <item name="Wall" icon="presets/barrier/wall.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:barrier=wall" />
             <key key="barrier" value="wall" />
             <reference ref="optional_height" />
-            <combo key="wall" text="Type" values="castle_wall,dry_stone,flood_wall,noise_barrier,seawall" />
+            <combo key="wall" text="Type" values="castle_wall,dry_stone,flood_wall,noise_barrier,seawall" values_searchable="true" />
             <reference ref="wall_material" />
         </item> <!-- Wall -->
-        <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway" preset_name_label="true">
+        <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:barrier=city_wall" />
             <key key="barrier" value="city_wall" />
@@ -1700 +1700 @@
             <key key="man_made" value="dyke" />
         </item> <!-- Levee -->
-        <item name="Groyne" icon="presets/nautical/groyne.svg" type="way,closedway" preset_name_label="true">
+        <item name="Groyne" icon="presets/nautical/groyne.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=groyne" />
             <key key="man_made" value="groyne" />
@@ -2192 +2192 @@
         </item> <!-- Zip line -->
         <separator/>
-        <item name="Station" name_context="aerialway" icon="presets/transport/aerialway/station.svg" type="node,closedway" preset_name_label="true">
+        <item name="Station" name_context="aerialway" icon="presets/transport/aerialway/station.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:aerialway=station" />
             <space />
@@ -2505 +2505 @@
                 <role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
                 <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
-                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
-                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
+                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
+                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
                 <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="railway" />
             </roles>
@@ -2525 +2525 @@
                 <role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR share_taxi=yes OR trolleybus=yes)" />
                 <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
-                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
-                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
+                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
+                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
                 <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway" />
                 <role key="hail_and_ride" text="hail and ride route segment" requisite="optional" type="way,closedway" member_expression="highway" />
@@ -2563 +2563 @@
                 <role key="platform" text="Platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
                 <role key="" text="Subway Entrance" requisite="optional" type="node" member_expression="railway=subway_entrance" />
-                <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway" member_expression="amenity|public_transport=station" />
+                <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway,multipolygon" member_expression="amenity|public_transport=station" />
             </roles>
         </item> <!-- Stop Area -->
@@ -2659 +2659 @@
                 <role key="forward_stop" text="forward halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt OR railway=tram_stop" />
                 <role key="backward_stop" text="backward halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt OR railway=tram_stop" />
-                <role key="platform" text="platform" requisite="optional" type="node,way,closedway" member_expression="highway=platform OR railway=platform" />
+                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="highway=platform OR railway=platform" />
             </roles>
         </item> <!-- Public transport route (Legacy) -->
@@ -2737 +2737 @@
         </item> <!-- Airport Ground -->
         <separator/>
-        <item name="Runway" icon="presets/transport/airport/runway.svg" type="way,closedway" preset_name_label="true">
+        <item name="Runway" icon="presets/transport/airport/runway.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:aeroway=runway" />
             <key key="aeroway" value="runway" />
@@ -2745 +2745 @@
             </optional>
         </item> <!-- Runway -->
-        <item name="Taxiway" icon="presets/transport/airport/taxiway.svg" type="way,closedway" preset_name_label="true">
+        <item name="Taxiway" icon="presets/transport/airport/taxiway.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:aeroway=taxiway" />
             <key key="aeroway" value="taxiway" />
@@ -2759 +2759 @@
             </optional>
         </item> <!-- Holding Position -->
-        <item name="Helipad" icon="presets/transport/airport/helipad.svg" type="node,closedway" preset_name_label="true">
+        <item name="Helipad" icon="presets/transport/airport/helipad.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:aeroway=helipad" />
             <key key="aeroway" value="helipad" />
@@ -2865 +2865 @@
             <preset_link preset_name="Building" />
         </item> <!-- Guest House/Bed & Breakfast -->
-        <item name="Apartment" icon="presets/accommodation/apartment.svg" type="node,closedway" preset_name_label="true">
+        <item name="Apartment" icon="presets/accommodation/apartment.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:tourism=apartment" />
             <space />
@@ -3338 +3338 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beach Resort -->
-        <item name="Swimming Pool" icon="presets/sport/swimming.svg" type="node,closedway" preset_name_label="true">
+        <item name="Swimming Pool" icon="presets/sport/swimming.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=swimming_pool" />
             <key key="leisure" value="swimming_pool" />
@@ -4867 +4867 @@
             <reference ref="link_contact_address" />
         </item> <!-- Non-public police facility -->
-        <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway" preset_name_label="true">
+        <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=tower" />
             <space />
@@ -5051 +5051 @@
             <text key="name" text="Name" />
         </item> <!-- Wastewater Treatment Plant -->
-        <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway" preset_name_label="true">
+        <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=watermill" />
             <space />
@@ -5057 +5057 @@
             <text key="name" text="Name" />
         </item> <!-- Watermill -->
-        <item name="Fountain" icon="presets/misc/fountain.svg" type="node,closedway" preset_name_label="true">
+        <item name="Fountain" icon="presets/misc/fountain.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=fountain" />
             <space />
@@ -5172 +5172 @@
     </group> <!-- Man Made -->
     <group name="Bridges" icon="presets/transport/bridge/bridge.svg">
-        <item name="Bridge" icon="presets/transport/bridge/bridge.svg" type="way,relation,multipolygon" preset_name_label="true">
+        <item name="Bridge" icon="presets/transport/bridge/bridge.svg" type="way,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:bridge" />
             <space />
@@ -5179 +5179 @@
             <reference ref="optional_bridge" />
         </item> <!-- Bridge -->
-        <item name="Movable Bridge" icon="presets/transport/bridge/bridge_movable.svg" type="way,relation,multipolygon" preset_name_label="true">
+        <item name="Movable Bridge" icon="presets/transport/bridge/bridge_movable.svg" type="way,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:bridge:movable" />
             <space />
@@ -5229 +5229 @@
     </group> <!-- Military -->
     <group name="Power" icon="presets/power/power.svg">
-        <item name="Power Plant" icon="presets/power/plant.svg" type="closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:power=plant" />
             <space />
@@ -6942 +6942 @@
     </group> <!-- Boundaries -->
     <group name="Places" icon="presets/place/isolated_dwelling.svg">
-        <item name="Continent" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
+        <item name="Continent" icon="presets/place/capital.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=continent" />
             <space />
@@ -6948 +6948 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Continent -->
-        <item name="Country" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
+        <item name="Country" icon="presets/place/capital.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=country" />
             <space />
@@ -6954 +6954 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Country -->
-        <item name="State" icon="presets/place/capital.svg" name_context="place" type="node,closedway" preset_name_label="true">
+        <item name="State" icon="presets/place/capital.svg" name_context="place" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=state" />
             <space />
@@ -6960 +6960 @@
             <reference ref="name_wikipedia" />
         </item> <!-- State -->
-        <item name="Region" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
+        <item name="Region" icon="presets/place/capital.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=region" />
             <space />
@@ -6966 +6966 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Region -->
-        <item name="County" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
+        <item name="County" icon="presets/place/capital.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=county" />
             <space />
@@ -6974 +6974 @@
         </item> <!-- County -->
         <separator/>
-        <item name="City" icon="presets/place/city.svg" type="node,closedway" preset_name_label="true">
+        <item name="City" icon="presets/place/city.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=city" />
             <space />
@@ -6981 +6981 @@
             <reference ref="population_postcode_website" />
         </item> <!-- City -->
-        <item name="Town" icon="presets/place/town.svg" type="node,closedway" preset_name_label="true">
+        <item name="Town" icon="presets/place/town.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=town" />
             <space />
@@ -6988 +6988 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Town -->
-        <item name="Village" icon="presets/place/village.svg" type="node,closedway" preset_name_label="true">
+        <item name="Village" icon="presets/place/village.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=village" />
             <space />
@@ -6995 +6995 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Village -->
-        <item name="Hamlet" icon="presets/place/hamlet.svg" type="node,closedway" preset_name_label="true">
+        <item name="Hamlet" icon="presets/place/hamlet.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=hamlet" />
             <space />
@@ -7002 +7002 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Hamlet -->
-        <item name="Isolated Dwelling" icon="presets/place/isolated_dwelling.svg" type="node,closedway" preset_name_label="true">
+        <item name="Isolated Dwelling" icon="presets/place/isolated_dwelling.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=isolated_dwelling" />
             <space />
@@ -7010 +7010 @@
         </item> <!-- Isolated Dwelling -->
         <separator/>
-        <item name="Suburb" icon="presets/place/suburb.svg" type="node,closedway" preset_name_label="true">
+        <item name="Suburb" icon="presets/place/suburb.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=suburb" />
             <space />
@@ -7017 +7017 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Suburb -->
-        <item name="Quarter" icon="presets/place/quarter.svg" type="node,closedway" preset_name_label="true">
+        <item name="Quarter" icon="presets/place/quarter.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=quarter" />
             <space />
@@ -7025 +7025 @@
             <text key="website" text="Website" />
         </item> <!-- Quarter -->
-        <item name="Neighbourhood" icon="presets/place/neighbourhood.svg" type="node,closedway" preset_name_label="true">
+        <item name="Neighbourhood" icon="presets/place/neighbourhood.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=neighbourhood" />
             <space />
@@ -7033 +7033 @@
             <text key="website" text="Website" />
         </item> <!-- Neighbourhood -->
-        <item name="Farm" icon="presets/place/farm.svg" type="node,closedway" preset_name_label="true">
+        <item name="Farm" icon="presets/place/farm.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=farm" />
             <space />
@@ -7043 +7043 @@
         </item> <!-- Farm -->
         <separator/>
-        <item name="Locality" icon="presets/place/locality.svg" type="node,closedway" preset_name_label="true">
+        <item name="Locality" icon="presets/place/locality.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=locality" />
             <space />
@@ -7510 +7510 @@
   </group> <!-- Geography -->
     <group name="Annotation" icon="presets/misc/housenumber.svg">
-        <item name="Name" icon="presets/misc/name.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Name" icon="presets/misc/name.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:name" />
             <space />
@@ -7525 +7525 @@
             </optional>
         </item> <!-- Name -->
-        <item name="Address" icon="presets/misc/housenumber.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Address" icon="presets/misc/housenumber.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:addr" />
             <space />
@@ -7556 +7556 @@
             </optional>
         </item> <!-- Address Interpolation -->
-        <item name="Contact (Common Schema)" icon="presets/misc/contact.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Contact (Common Schema)" icon="presets/misc/contact.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Annotations" />
             <space />
@@ -7569 +7569 @@
             <text key="image" text="Image" />
         </item> <!-- Contact (Common Schema) -->
-        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:contact" />
             <space />
@@ -7582 +7582 @@
             <text key="image" text="Image" />
         </item> <!-- Contact (Schema with 'contact:*' Prefix) -->
-        <item name="Description" icon="presets/misc/description.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Description" icon="presets/misc/description.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:description" />
             <space />
@@ -7594 +7594 @@
             <preset_link preset_name="Fixme" />
         </item> <!-- Description -->
-        <item name="Note" icon="presets/misc/note.svg" name_context="the tag note=*" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Note" icon="presets/misc/note.svg" name_context="the tag note=*" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:note" />
             <space />
@@ -7605 +7605 @@
             <preset_link preset_name="Description" />
         </item> <!-- Note -->
-        <item name="Fixme" icon="presets/misc/fixme.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Fixme" icon="presets/misc/fixme.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Key:fixme" />
             <space />
@@ -7618 +7618 @@
     </group> <!-- Annotation -->
     <group name="Relations" icon="presets/misc/relations.svg">
-        <item name="Multipolygon" icon="presets/misc/multipolygon.svg" type="relation,multipolygon" preset_name_label="true">
+        <item name="Multipolygon" icon="presets/misc/multipolygon.svg" type="multipolygon,relation" preset_name_label="true">
             <link wiki="Relation:multipolygon" />
             <key key="type" value="multipolygon" />
@@ -7629 +7629 @@
             </roles>
         </item> <!-- Multipolygon -->
-        <item name="Boundary" icon="presets/misc/boundaries.svg" type="relation,multipolygon" preset_name_label="true">
+        <item name="Boundary" icon="presets/misc/boundaries.svg" type="multipolygon,relation" preset_name_label="true">
             <link wiki="Relation:boundary" />
             <space />
@@ -7941 +7941 @@
             <roles>
                 <role key="street" text="ways being part of street" requisite="required" type="way" />
-                <role key="address" text="addresses belonging to the street" requisite="optional" type="node,way,closedway" />
-                <role key="house" text="houses belonging to the street" requisite="optional" type="node,way,closedway" />
-                <role key="associated" text="anything related to the street" requisite="optional" type="node,way,closedway" />
+                <role key="address" text="addresses belonging to the street" requisite="optional" type="node,way,closedway,multipolygon" />
+                <role key="house" text="houses belonging to the street" requisite="optional" type="node,way,closedway,multipolygon" />
+                <role key="associated" text="anything related to the street" requisite="optional" type="node,way,closedway,multipolygon" />
             </roles>
         </item> <!-- Street -->

trunk/resources/styles/standard/elemstyles.mapcss

@@ -403 +403 @@
     width: 2;
     color: barrier#F0F050;
+}
+way[barrier=hedge][area?], relation[type=multipolygon][barrier=hedge],
+way[barrier=wall][area?], relation[type=multipolygon][barrier=wall],
+way[barrier=city_wall][area?], relation[type=multipolygon][barrier=city_wall] {
+    fill-color: barrier#F0F050;
 }
 way[barrier=kerb] {