Changeset 15715 in josm
- Timestamp:
- 2020-01-17T21:00:40+01:00 (5 years ago)
- Location:
- trunk/data
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/defaultpresets.xml
r15713 r15715 468 468 <role key="forward" text="forward segment" requisite="optional" type="way,closedway" /> 469 469 <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"/> 470 471 </chunk> 471 472 <chunk id="route_start_stop_roles"> … … 3676 3677 <reference ref="min_age" /> 3677 3678 <reference ref="max_age" /> 3679 <combo key="isced:level" text="ISCED level" values="0" /> 3678 3680 <reference ref="link_contact_address" /> 3679 3681 <preset_link preset_name="Building" /> … … 3685 3687 <reference ref="name_operator_oh_wheelchair" /> 3686 3688 <reference ref="min_age" /> 3689 <multiselect key="isced:level" text="ISCED level" values="0;1;2;3;4" /> 3687 3690 <reference ref="link_contact_address" /> 3688 3691 <preset_link preset_name="Building" /> … … 3693 3696 <key key="amenity" value="university" /> 3694 3697 <reference ref="name_operator_oh_wheelchair" /> 3698 <multiselect key="isced:level" text="ISCED level" values="4;5;6;7;8" /> 3695 3699 <reference ref="link_contact_address" /> 3696 3700 </item> <!-- University --> … … 3700 3704 <key key="amenity" value="college" /> 3701 3705 <reference ref="name_operator_oh_wheelchair" /> 3706 <multiselect key="isced:level" text="ISCED level" values="3;4;5;6;7" /> 3702 3707 <reference ref="link_contact_address" /> 3703 3708 </item> <!-- College --> … … 7750 7755 <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/> 7751 7756 <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"/> 7752 7758 </roles> 7753 7759 </item> <!-- Riding Route --> … … 7770 7776 <role key="variant" text="variant segment" requisite="optional" type="way" /> 7771 7777 <role key="start" text="entry points" requisite="optional" type="node" /> 7778 <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/> 7772 7779 </roles> 7773 7780 </item> <!-- Piste Route --> … … 7790 7797 <role key="variant" text="variant segment" requisite="optional" type="way" /> 7791 7798 <role key="start" text="entry points" requisite="optional" type="node" /> 7799 <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/> 7792 7800 </roles> 7793 7801 </item> <!-- Ski Route --> … … 7807 7815 <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/> 7808 7816 <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"/> 7809 7818 </roles> 7810 7819 </item> <!-- Detour Route --> … … 7844 7853 <role key="backward" text="backward segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry"/> 7845 7854 <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"/> 7846 7856 </roles> 7847 7857 </item> <!-- Road Route --> -
trunk/data/validator/deprecated.mapcss
r15648 r15715 1879 1879 group: tr("deprecated tagging"); 1880 1880 } 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 72 72 E:rcn_ref 73 73 E:lcn_ref 74 E:isced:level 74 75 E:place_name 75 76 E:cycleway -
trunk/data/validator/numeric.mapcss
r15383 r15715 398 398 assertMatch: "way aeroway=aerodrome icao=EQQQ"; 399 399 } 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.