Changeset 13998 in josm for trunk


Ignore:
Timestamp:
2018-07-04T01:03:02+02:00 (12 months ago)
Author:
Don-vip
Message:

fix #16458 - add guidepost role to walking routes presets (route=hiking/foot)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r13988 r13998  
    438438  <chunk id="motorcycle_brands">
    439439    <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
     440  </chunk>
     441  <chunk id="walking_routes_roles">
     442     <roles>
     443         <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
     444         <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
     445         <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
     446         <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     447     </roles>
    440448  </chunk>
    441449  <!-- Link chunks -->
     
    1169411702                    <reference ref="route_hikebike_optionals" />
    1169511703                </optional>
    11696                 <roles>
    11697                     <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
    11698                     <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
    11699                     <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
    11700                 </roles>
     11704                <reference ref="walking_routes_roles" />
    1170111705            </item> <!-- Hiking Route -->
    1170211706            <item name="Walking Route" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
     
    1171211716                    <reference ref="route_hikebike_optionals" />
    1171311717                </optional>
    11714                 <roles>
    11715                     <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
    11716                     <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
    11717                     <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
    11718                 </roles>
     11718                <reference ref="walking_routes_roles" />
    1171911719            </item> <!-- Walking Route -->
    1172011720            <item name="Riding Route" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
  • trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java

    r13852 r13998  
    272272                        all.getLast().roles = (Roles) o;
    273273                        lastrole = (Roles) o;
     274                        // #16458 - Make sure we don't duplicate role entries if used in a chunk/reference
     275                        lastrole.roles.clear();
    274276                    } else if (o instanceof Role) {
    275277                        if (lastrole == null)
Note: See TracChangeset for help on using the changeset viewer.