Changeset 16245 in josm for trunk/resources/data


Ignore:
Timestamp:
2020-04-08T18:20:25+02:00 (5 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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r16137 r16245  
    14201420            <reference ref="optional_height" />
    14211421        </item> <!-- Guard Rail -->
    1422         <item name="Wall" icon="presets/barrier/wall.svg" type="way,closedway" preset_name_label="true">
     1422        <item name="Wall" icon="presets/barrier/wall.svg" type="way,closedway,multipolygon" preset_name_label="true">
    14231423            <link wiki="Tag:barrier=wall" />
    14241424            <key key="barrier" value="wall" />
    14251425            <reference ref="optional_height" />
    1426             <combo key="wall" text="Type" values="castle_wall,dry_stone,flood_wall,noise_barrier,seawall" />
     1426            <combo key="wall" text="Type" values="castle_wall,dry_stone,flood_wall,noise_barrier,seawall" values_searchable="true" />
    14271427            <reference ref="wall_material" />
    14281428        </item> <!-- Wall -->
    1429         <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway" preset_name_label="true">
     1429        <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway,multipolygon" preset_name_label="true">
    14301430            <link wiki="Tag:barrier=city_wall" />
    14311431            <key key="barrier" value="city_wall" />
    … …  
    17001700            <key key="man_made" value="dyke" />
    17011701        </item> <!-- Levee -->
    1702         <item name="Groyne" icon="presets/nautical/groyne.svg" type="way,closedway" preset_name_label="true">
     1702        <item name="Groyne" icon="presets/nautical/groyne.svg" type="way,closedway,multipolygon" preset_name_label="true">
    17031703            <link wiki="Tag:man_made=groyne" />
    17041704            <key key="man_made" value="groyne" />
    … …  
    21922192        </item> <!-- Zip line -->
    21932193        <separator/>
    2194         <item name="Station" name_context="aerialway" icon="presets/transport/aerialway/station.svg" type="node,closedway" preset_name_label="true">
     2194        <item name="Station" name_context="aerialway" icon="presets/transport/aerialway/station.svg" type="node,closedway,multipolygon" preset_name_label="true">
    21952195            <link wiki="Tag:aerialway=station" />
    21962196            <space />
    … …  
    25052505                <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)" />
    25062506                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    2507                 <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
    2508                 <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
     2507                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
     2508                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    25092509                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="railway" />
    25102510            </roles>
    … …  
    25252525                <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)" />
    25262526                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    2527                 <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
    2528                 <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
     2527                <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
     2528                <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    25292529                <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway" />
    25302530                <role key="hail_and_ride" text="hail and ride route segment" requisite="optional" type="way,closedway" member_expression="highway" />
    … …  
    25632563                <role key="platform" text="Platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
    25642564                <role key="" text="Subway Entrance" requisite="optional" type="node" member_expression="railway=subway_entrance" />
    2565                 <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway" member_expression="amenity|public_transport=station" />
     2565                <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway,multipolygon" member_expression="amenity|public_transport=station" />
    25662566            </roles>
    25672567        </item> <!-- Stop Area -->
    … …  
    26592659                <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" />
    26602660                <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" />
    2661                 <role key="platform" text="platform" requisite="optional" type="node,way,closedway" member_expression="highway=platform OR railway=platform" />
     2661                <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="highway=platform OR railway=platform" />
    26622662            </roles>
    26632663        </item> <!-- Public transport route (Legacy) -->
    … …  
    27372737        </item> <!-- Airport Ground -->
    27382738        <separator/>
    2739         <item name="Runway" icon="presets/transport/airport/runway.svg" type="way,closedway" preset_name_label="true">
     2739        <item name="Runway" icon="presets/transport/airport/runway.svg" type="way,closedway,multipolygon" preset_name_label="true">
    27402740            <link wiki="Tag:aeroway=runway" />
    27412741            <key key="aeroway" value="runway" />
    … …  
    27452745            </optional>
    27462746        </item> <!-- Runway -->
    2747         <item name="Taxiway" icon="presets/transport/airport/taxiway.svg" type="way,closedway" preset_name_label="true">
     2747        <item name="Taxiway" icon="presets/transport/airport/taxiway.svg" type="way,closedway,multipolygon" preset_name_label="true">
    27482748            <link wiki="Tag:aeroway=taxiway" />
    27492749            <key key="aeroway" value="taxiway" />
    … …  
    27592759            </optional>
    27602760        </item> <!-- Holding Position -->
    2761         <item name="Helipad" icon="presets/transport/airport/helipad.svg" type="node,closedway" preset_name_label="true">
     2761        <item name="Helipad" icon="presets/transport/airport/helipad.svg" type="node,closedway,multipolygon" preset_name_label="true">
    27622762            <link wiki="Tag:aeroway=helipad" />
    27632763            <key key="aeroway" value="helipad" />
    … …  
    28652865            <preset_link preset_name="Building" />
    28662866        </item> <!-- Guest House/Bed & Breakfast -->
    2867         <item name="Apartment" icon="presets/accommodation/apartment.svg" type="node,closedway" preset_name_label="true">
     2867        <item name="Apartment" icon="presets/accommodation/apartment.svg" type="node,closedway,multipolygon" preset_name_label="true">
    28682868            <link wiki="Tag:tourism=apartment" />
    28692869            <space />
    … …  
    33383338            <reference ref="link_contact_address_payment" />
    33393339        </item> <!-- Beach Resort -->
    3340         <item name="Swimming Pool" icon="presets/sport/swimming.svg" type="node,closedway" preset_name_label="true">
     3340        <item name="Swimming Pool" icon="presets/sport/swimming.svg" type="node,closedway,multipolygon" preset_name_label="true">
    33413341            <link wiki="Tag:leisure=swimming_pool" />
    33423342            <key key="leisure" value="swimming_pool" />
    … …  
    48674867            <reference ref="link_contact_address" />
    48684868        </item> <!-- Non-public police facility -->
    4869         <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway" preset_name_label="true">
     4869        <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
    48704870            <link wiki="Tag:man_made=tower" />
    48714871            <space />
    … …  
    50515051            <text key="name" text="Name" />
    50525052        </item> <!-- Wastewater Treatment Plant -->
    5053         <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway" preset_name_label="true">
     5053        <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway,multipolygon" preset_name_label="true">
    50545054            <link wiki="Tag:man_made=watermill" />
    50555055            <space />
    … …  
    50575057            <text key="name" text="Name" />
    50585058        </item> <!-- Watermill -->
    5059         <item name="Fountain" icon="presets/misc/fountain.svg" type="node,closedway" preset_name_label="true">
     5059        <item name="Fountain" icon="presets/misc/fountain.svg" type="node,closedway,multipolygon" preset_name_label="true">
    50605060            <link wiki="Tag:amenity=fountain" />
    50615061            <space />
    … …  
    51725172    </group> <!-- Man Made -->
    51735173    <group name="Bridges" icon="presets/transport/bridge/bridge.svg">
    5174         <item name="Bridge" icon="presets/transport/bridge/bridge.svg" type="way,relation,multipolygon" preset_name_label="true">
     5174        <item name="Bridge" icon="presets/transport/bridge/bridge.svg" type="way,multipolygon,relation" preset_name_label="true">
    51755175            <link wiki="Key:bridge" />
    51765176            <space />
    … …  
    51795179            <reference ref="optional_bridge" />
    51805180        </item> <!-- Bridge -->
    5181         <item name="Movable Bridge" icon="presets/transport/bridge/bridge_movable.svg" type="way,relation,multipolygon" preset_name_label="true">
     5181        <item name="Movable Bridge" icon="presets/transport/bridge/bridge_movable.svg" type="way,multipolygon,relation" preset_name_label="true">
    51825182            <link wiki="Key:bridge:movable" />
    51835183            <space />
    … …  
    52295229    </group> <!-- Military -->
    52305230    <group name="Power" icon="presets/power/power.svg">
    5231         <item name="Power Plant" icon="presets/power/plant.svg" type="closedway,relation,multipolygon" preset_name_label="true">
     5231        <item name="Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    52325232            <link wiki="Tag:power=plant" />
    52335233            <space />
    … …  
    69426942    </group> <!-- Boundaries -->
    69436943    <group name="Places" icon="presets/place/isolated_dwelling.svg">
    6944         <item name="Continent" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
     6944        <item name="Continent" icon="presets/place/capital.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    69456945            <link wiki="Tag:place=continent" />
    69466946            <space />
    … …  
    69486948            <reference ref="name_wikipedia" />
    69496949        </item> <!-- Continent -->
    6950         <item name="Country" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
     6950        <item name="Country" icon="presets/place/capital.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    69516951            <link wiki="Tag:place=country" />
    69526952            <space />
    … …  
    69546954            <reference ref="name_wikipedia" />
    69556955        </item> <!-- Country -->
    6956         <item name="State" icon="presets/place/capital.svg" name_context="place" type="node,closedway" preset_name_label="true">
     6956        <item name="State" icon="presets/place/capital.svg" name_context="place" type="node,closedway,multipolygon,relation" preset_name_label="true">
    69576957            <link wiki="Tag:place=state" />
    69586958            <space />
    … …  
    69606960            <reference ref="name_wikipedia" />
    69616961        </item> <!-- State -->
    6962         <item name="Region" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
     6962        <item name="Region" icon="presets/place/capital.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    69636963            <link wiki="Tag:place=region" />
    69646964            <space />
    … …  
    69666966            <reference ref="name_wikipedia" />
    69676967        </item> <!-- Region -->
    6968         <item name="County" icon="presets/place/capital.svg" type="node,closedway" preset_name_label="true">
     6968        <item name="County" icon="presets/place/capital.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    69696969            <link wiki="Tag:place=county" />
    69706970            <space />
    … …  
    69746974        </item> <!-- County -->
    69756975        <separator/>
    6976         <item name="City" icon="presets/place/city.svg" type="node,closedway" preset_name_label="true">
     6976        <item name="City" icon="presets/place/city.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    69776977            <link wiki="Tag:place=city" />
    69786978            <space />
    … …  
    69816981            <reference ref="population_postcode_website" />
    69826982        </item> <!-- City -->
    6983         <item name="Town" icon="presets/place/town.svg" type="node,closedway" preset_name_label="true">
     6983        <item name="Town" icon="presets/place/town.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    69846984            <link wiki="Tag:place=town" />
    69856985            <space />
    … …  
    69886988            <reference ref="population_postcode_website" />
    69896989        </item> <!-- Town -->
    6990         <item name="Village" icon="presets/place/village.svg" type="node,closedway" preset_name_label="true">
     6990        <item name="Village" icon="presets/place/village.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    69916991            <link wiki="Tag:place=village" />
    69926992            <space />
    … …  
    69956995            <reference ref="population_postcode_website" />
    69966996        </item> <!-- Village -->
    6997         <item name="Hamlet" icon="presets/place/hamlet.svg" type="node,closedway" preset_name_label="true">
     6997        <item name="Hamlet" icon="presets/place/hamlet.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    69986998            <link wiki="Tag:place=hamlet" />
    69996999            <space />
    … …  
    70027002            <reference ref="population_postcode_website" />
    70037003        </item> <!-- Hamlet -->
    7004         <item name="Isolated Dwelling" icon="presets/place/isolated_dwelling.svg" type="node,closedway" preset_name_label="true">
     7004        <item name="Isolated Dwelling" icon="presets/place/isolated_dwelling.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    70057005            <link wiki="Tag:place=isolated_dwelling" />
    70067006            <space />
    … …  
    70107010        </item> <!-- Isolated Dwelling -->
    70117011        <separator/>
    7012         <item name="Suburb" icon="presets/place/suburb.svg" type="node,closedway" preset_name_label="true">
     7012        <item name="Suburb" icon="presets/place/suburb.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    70137013            <link wiki="Tag:place=suburb" />
    70147014            <space />
    … …  
    70177017            <reference ref="population_postcode_website" />
    70187018        </item> <!-- Suburb -->
    7019         <item name="Quarter" icon="presets/place/quarter.svg" type="node,closedway" preset_name_label="true">
     7019        <item name="Quarter" icon="presets/place/quarter.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    70207020            <link wiki="Tag:place=quarter" />
    70217021            <space />
    … …  
    70257025            <text key="website" text="Website" />
    70267026        </item> <!-- Quarter -->
    7027         <item name="Neighbourhood" icon="presets/place/neighbourhood.svg" type="node,closedway" preset_name_label="true">
     7027        <item name="Neighbourhood" icon="presets/place/neighbourhood.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    70287028            <link wiki="Tag:place=neighbourhood" />
    70297029            <space />
    … …  
    70337033            <text key="website" text="Website" />
    70347034        </item> <!-- Neighbourhood -->
    7035         <item name="Farm" icon="presets/place/farm.svg" type="node,closedway" preset_name_label="true">
     7035        <item name="Farm" icon="presets/place/farm.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    70367036            <link wiki="Tag:place=farm" />
    70377037            <space />
    … …  
    70437043        </item> <!-- Farm -->
    70447044        <separator/>
    7045         <item name="Locality" icon="presets/place/locality.svg" type="node,closedway" preset_name_label="true">
     7045        <item name="Locality" icon="presets/place/locality.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    70467046            <link wiki="Tag:place=locality" />
    70477047            <space />
    … …  
    75107510  </group> <!-- Geography -->
    75117511    <group name="Annotation" icon="presets/misc/housenumber.svg">
    7512         <item name="Name" icon="presets/misc/name.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
     7512        <item name="Name" icon="presets/misc/name.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
    75137513            <link wiki="Key:name" />
    75147514            <space />
    … …  
    75257525            </optional>
    75267526        </item> <!-- Name -->
    7527         <item name="Address" icon="presets/misc/housenumber.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
     7527        <item name="Address" icon="presets/misc/housenumber.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
    75287528            <link wiki="Key:addr" />
    75297529            <space />
    … …  
    75567556            </optional>
    75577557        </item> <!-- Address Interpolation -->
    7558         <item name="Contact (Common Schema)" icon="presets/misc/contact.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
     7558        <item name="Contact (Common Schema)" icon="presets/misc/contact.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
    75597559            <link wiki="Annotations" />
    75607560            <space />
    … …  
    75697569            <text key="image" text="Image" />
    75707570        </item> <!-- Contact (Common Schema) -->
    7571         <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
     7571        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
    75727572            <link wiki="Key:contact" />
    75737573            <space />
    … …  
    75827582            <text key="image" text="Image" />
    75837583        </item> <!-- Contact (Schema with 'contact:*' Prefix) -->
    7584         <item name="Description" icon="presets/misc/description.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
     7584        <item name="Description" icon="presets/misc/description.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
    75857585            <link wiki="Key:description" />
    75867586            <space />
    … …  
    75947594            <preset_link preset_name="Fixme" />
    75957595        </item> <!-- Description -->
    7596         <item name="Note" icon="presets/misc/note.svg" name_context="the tag note=*" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
     7596        <item name="Note" icon="presets/misc/note.svg" name_context="the tag note=*" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
    75977597            <link wiki="Key:note" />
    75987598            <space />
    … …  
    76057605            <preset_link preset_name="Description" />
    76067606        </item> <!-- Note -->
    7607         <item name="Fixme" icon="presets/misc/fixme.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
     7607        <item name="Fixme" icon="presets/misc/fixme.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
    76087608            <link wiki="Key:fixme" />
    76097609            <space />
    … …  
    76187618    </group> <!-- Annotation -->
    76197619    <group name="Relations" icon="presets/misc/relations.svg">
    7620         <item name="Multipolygon" icon="presets/misc/multipolygon.svg" type="relation,multipolygon" preset_name_label="true">
     7620        <item name="Multipolygon" icon="presets/misc/multipolygon.svg" type="multipolygon,relation" preset_name_label="true">
    76217621            <link wiki="Relation:multipolygon" />
    76227622            <key key="type" value="multipolygon" />
    … …  
    76297629            </roles>
    76307630        </item> <!-- Multipolygon -->
    7631         <item name="Boundary" icon="presets/misc/boundaries.svg" type="relation,multipolygon" preset_name_label="true">
     7631        <item name="Boundary" icon="presets/misc/boundaries.svg" type="multipolygon,relation" preset_name_label="true">
    76327632            <link wiki="Relation:boundary" />
    76337633            <space />
    … …  
    79417941            <roles>
    79427942                <role key="street" text="ways being part of street" requisite="required" type="way" />
    7943                 <role key="address" text="addresses belonging to the street" requisite="optional" type="node,way,closedway" />
    7944                 <role key="house" text="houses belonging to the street" requisite="optional" type="node,way,closedway" />
    7945                 <role key="associated" text="anything related to the street" requisite="optional" type="node,way,closedway" />
     7943                <role key="address" text="addresses belonging to the street" requisite="optional" type="node,way,closedway,multipolygon" />
     7944                <role key="house" text="houses belonging to the street" requisite="optional" type="node,way,closedway,multipolygon" />
     7945                <role key="associated" text="anything related to the street" requisite="optional" type="node,way,closedway,multipolygon" />
    79467946            </roles>
    79477947        </item> <!-- Street -->
Note: See TracChangeset for help on using the changeset viewer.