Changeset 10320 in josm for trunk


Ignore:
Timestamp:
2016-06-03T19:40:08+02:00 (8 years ago)
Author:
Klumbumbus
Message:

fix #12864 - update route relation presets: move name up, move ref and operator to optional, remove keyvalue! from network tag and add validator warning for missing network or piste:type, this also fixes confusing warning about relation type, fix key of ski route

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r10319 r10320  
    231231    </chunk>
    232232    <chunk id="route_hikebike_optionals">
     233        <text key="ref" text="Reference" />
     234        <text key="operator" text="Operator" />
    233235        <text key="distance" text="Distance (km)"/>
    234236        <text key="ascent" text="Ascent (m)"/>
    … …  
    98569858                <key key="type" value="route"/>
    98579859                <key key="route" value="bicycle"/>
    9858                 <combo key="network" text="Network" values="icn,ncn,rcn,lcn" match="keyvalue!" />
    9859                 <reference ref="name_ref_operator"/>
     9860                <text key="name" text="Name" />
     9861                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" />
    98609862                <optional>
    98619863                    <reference ref="route_hikebike_optionals" />
    … …  
    98809882                <key key="type" value="route"/>
    98819883                <key key="route" value="mtb"/>
    9882                 <reference ref="name_ref_operator"/>
     9884                <text key="name" text="Name" />
    98839885                <optional>
    98849886                    <reference ref="route_hikebike_optionals" />
    … …  
    99039905                <key key="type" value="route"/>
    99049906                <key key="route" value="hiking"/>
    9905                 <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" match="keyvalue!" />
    9906                 <reference ref="name_ref_operator"/>
     9907                <text key="name" text="Name" />
     9908                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" />
    99079909                <optional>
    99089910                    <reference ref="route_hikebike_optionals" />
    … …  
    99199921                <key key="type" value="route"/>
    99209922                <key key="route" value="foot"/>
    9921                 <combo key="network" text="Network" values="rwn,lwn" match="keyvalue!" />
    9922                 <reference ref="name_ref_operator"/>
     9923                <text key="name" text="Name" />
     9924                <combo key="network" text="Network" values="rwn,lwn" />
    99239925                <optional>
    99249926                    <reference ref="route_hikebike_optionals" />
    … …  
    99359937                <key key="type" value="route"/>
    99369938                <key key="route" value="horse"/>
    9937                 <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" match="keyvalue!" />
    9938                 <reference ref="name_ref_operator"/>
     9939                <text key="name" text="Name" />
     9940                <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" />
    99399941                <optional>
    99409942                    <reference ref="route_hikebike_optionals" />
    … …  
    99539955                <key key="type" value="route"/>
    99549956                <key key="route" value="piste"/>
    9955                 <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" match="keyvalue!" />
    9956                 <reference ref="name_ref_operator"/>
     9957                <text key="name" text="Name" />
     9958                <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
    99579959                <optional>
    99589960                    <reference ref="route_hikebike_optionals" />
    … …  
    99739975                <space/>
    99749976                <key key="type" value="route"/>
    9975                 <key key="route" value="piste"/>
    9976                 <combo key="piste:type" text="Piste type" values="nordic,alpine" match="keyvalue!" />
    9977                 <reference ref="name_ref_operator"/>
     9977                <key key="route" value="ski"/>
     9978                <text key="name" text="Name" />
     9979                <combo key="piste:type" text="Piste type" values="nordic,alpine" />
    99789980                <optional>
    99799981                    <reference ref="route_hikebike_optionals" />
    … …  
    99969998                <key key="type" value="route"/>
    99979999                <key key="route" value="detour"/>
    9998                 <reference ref="name_ref_operator"/>
     10000                <reference ref="name_ref"/>
    999910001                <optional>
     10002                    <text key="operator" text="Operator" />
    1000010003                    <text key="destination" text="Destination"/>
    1000110004                    <text key="detour" text="Ref of the way this is a detour to"/>

  • trunk/data/validator/combinations.mapcss

    r10272 r10320  
    118118
    119119/* {0.tag} without {1.key} (warning level) */
     120relation[route=bicycle][!network][type=route],
     121relation[route=hiking][!network][type=route],
     122relation[route=foot][!network][type=route],
     123relation[route=horse][!network][type=route],
     124relation[route=piste][!piste:type][type=route],
     125relation[route=ski][!piste:type][type=route],
    120126*[tourism=information][!information],
    121127*[aeroway=terminal][!building],
Note: See TracChangeset for help on using the changeset viewer.