Changeset 15715 in josm


Ignore:
Timestamp:
2020-01-17T21:00:40+01:00 (4 months ago)
Author:
Klumbumbus
Message:
  • fix #18571 - deprecate unnamed=yes in favor of noname=yes
  • fix #18572, see #16458 - add guidepost role to other route relation presets too
  • fix #18573 - add isced:level to education presets
Location:
trunk/data
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r15713 r15715  
    468468     <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
    469469     <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     470     <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    470471  </chunk>
    471472  <chunk id="route_start_stop_roles">
     
    36763677            <reference ref="min_age" />
    36773678            <reference ref="max_age" />
     3679            <combo key="isced:level" text="ISCED level" values="0" />
    36783680            <reference ref="link_contact_address" />
    36793681            <preset_link preset_name="Building" />
     
    36853687            <reference ref="name_operator_oh_wheelchair" />
    36863688            <reference ref="min_age" />
     3689            <multiselect key="isced:level" text="ISCED level" values="0;1;2;3;4" />
    36873690            <reference ref="link_contact_address" />
    36883691            <preset_link preset_name="Building" />
     
    36933696            <key key="amenity" value="university" />
    36943697            <reference ref="name_operator_oh_wheelchair" />
     3698            <multiselect key="isced:level" text="ISCED level" values="4;5;6;7;8" />
    36953699            <reference ref="link_contact_address" />
    36963700        </item> <!-- University -->
     
    37003704            <key key="amenity" value="college" />
    37013705            <reference ref="name_operator_oh_wheelchair" />
     3706            <multiselect key="isced:level" text="ISCED level" values="3;4;5;6;7" />
    37023707            <reference ref="link_contact_address" />
    37033708        </item> <!-- College -->
     
    77507755                    <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
    77517756                    <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"/>
     7757                    <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    77527758                </roles>
    77537759            </item> <!-- Riding Route -->
     
    77707776                    <role key="variant" text="variant segment" requisite="optional" type="way" />
    77717777                    <role key="start" text="entry points" requisite="optional" type="node" />
     7778                    <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    77727779                </roles>
    77737780            </item> <!-- Piste Route -->
     
    77907797                    <role key="variant" text="variant segment" requisite="optional" type="way" />
    77917798                    <role key="start" text="entry points" requisite="optional" type="node" />
     7799                    <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    77927800                </roles>
    77937801            </item> <!-- Ski Route -->
     
    78077815                    <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
    78087816                    <role key="fork" text="fork node for alternative routes" requisite="optional" type="node"/>
     7817                    <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    78097818                </roles>
    78107819            </item> <!-- Detour Route -->
     
    78447853                    <role key="backward" text="backward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry"/>
    78457854                    <role key="link" text="link segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry"/>
     7855                    <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    78467856                </roles>
    78477857            </item> <!-- Road Route -->
  • trunk/data/validator/deprecated.mapcss

    r15648 r15715  
    18791879  group: tr("deprecated tagging");
    18801880}
     1881
     1882/* #18571 */
     1883*[unnamed=yes] {
     1884  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1885  suggestAlternative: "noname=yes";
     1886  fixChangeKey: "unnamed => noname";
     1887  group: tr("deprecated tagging");
     1888}
  • trunk/data/validator/ignoretags.cfg

    r15694 r15715  
    7272E:rcn_ref
    7373E:lcn_ref
     74E:isced:level
    7475E:place_name
    7576E:cycleway
  • trunk/data/validator/numeric.mapcss

    r15383 r15715  
    398398  assertMatch: "way aeroway=aerodrome icao=EQQQ";
    399399}
     400
     401/* #18573 */
     402*[isced:level][isced:level !~ /^(0|1|2|3|4|5|6|7|8)((;|-)(1|2|3|4|5|6|7|8))*$/] {
     403  throwWarning: tr("unusual value of {0}", "{0.key}");
     404  assertMatch: "node isced:level=secondary";
     405  assertMatch: "node isced:level=0,1,2,3";
     406  assertMatch: "node isced:level=9";
     407  assertMatch: "node isced:level=10";
     408  assertNoMatch: "node isced:level=0;1;2;3";
     409  assertNoMatch: "node isced:level=0";
     410  assertNoMatch: "node isced:level=5";
     411  assertNoMatch: "node isced:level=0-3";
     412}
Note: See TracChangeset for help on using the changeset viewer.