Changeset 17469 in josm for trunk


Ignore:
Timestamp:
2021-01-18T15:23:58+01:00 (4 years ago)
Author:
Klumbumbus
Message:

fix #20392 - Add shoulder=* to major roads presets and warn about shoulder=none

Location:
trunk/resources/data
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r17468 r17469  
    7171        <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
    7272    </chunk>
    73     <chunk id="placement">
     73    <chunk id="placement_shoulder">
    7474        <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5,transition" />
    7575        <combo key="placement:forward" text="Placement in way direction" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5" />
    7676        <combo key="placement:backward" text="Placement opposed to way direction" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5" />
     77        <combo key="shoulder" text="Shoulder" values="yes,no,left,right,both" />
    7778    </chunk>
    7879    <chunk id="railway_service">
    … …  
    596597                    <check key="toll" text="Toll" />
    597598                </checkgroup>
    598                 <reference ref="placement" />
     599                <reference ref="placement_shoulder" />
    599600            </optional>
    600601            <reference ref="link_road_access_restrictions" />
    … …  
    618619                    <check key="toll" text="Toll" />
    619620                </checkgroup>
    620                 <reference ref="placement" />
     621                <reference ref="placement_shoulder" />
    621622            </optional>
    622623            <reference ref="link_road_access_restrictions" />
    … …  
    643644                    <check key="motorroad" text="Motorroad" default="on" />
    644645                </checkgroup>
    645                 <reference ref="placement" />
     646                <reference ref="placement_shoulder" />
    646647            </optional>
    647648            <reference ref="link_road_access_restrictions" />
    … …  
    667668                    <check key="motorroad" text="Motorroad" default="on" />
    668669                </checkgroup>
    669                 <reference ref="placement" />
     670                <reference ref="placement_shoulder" />
    670671            </optional>
    671672            <reference ref="link_road_access_restrictions" />
    … …  
    688689                    <check key="trolley_wire" text="Overhead trolley wires" />
    689690                </checkgroup>
    690                 <reference ref="placement" />
     691                <reference ref="placement_shoulder" />
    691692            </optional>
    692693            <reference ref="link_road_access_restrictions" />
    … …  
    703704                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    704705                <space />
    705                 <reference ref="placement" />
     706                <reference ref="placement_shoulder" />
    706707            </optional>
    707708            <reference ref="link_road_access_restrictions" />
    … …  
    722723                    <check key="trolley_wire" text="Overhead trolley wires" />
    723724                </checkgroup>
    724                 <reference ref="placement" />
     725                <reference ref="placement_shoulder" />
    725726            </optional>
    726727            <reference ref="link_road_access_restrictions" />
    … …  
    735736                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    736737                <space />
    737                 <reference ref="placement" />
     738                <reference ref="placement_shoulder" />
    738739            </optional>
    739740            <reference ref="link_road_access_restrictions" />
    … …  
    754755                    <check key="trolley_wire" text="Overhead trolley wires" />
    755756                </checkgroup>
    756                 <reference ref="placement" />
     757                <reference ref="placement_shoulder" />
    757758            </optional>
    758759            <reference ref="link_road_access_restrictions" />
    … …  
    767768                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    768769                <space />
    769                 <reference ref="placement" />
     770                <reference ref="placement_shoulder" />
    770771            </optional>
    771772            <reference ref="link_road_access_restrictions" />
    … …  
    786787                    <check key="passing_places" text="Passing Places" />
    787788                </checkgroup>
    788                 <reference ref="placement" />
     789                <reference ref="placement_shoulder" />
    789790            </optional>
    790791            <reference ref="link_road_access_restrictions" />

  • trunk/resources/data/validator/deprecated.mapcss

    r17468 r17469  
    22252225}
    22262226
    2227 /* #17498 */
     2227/* #17498, #20392 */
    22282228way[cycleway=none],
    22292229way[cycleway:left=none],
    2230 way[cycleway:right=none] {
     2230way[cycleway:right=none],
     2231way[shoulder=none] {
    22312232  throwWarning: tr("{0} is deprecated", "{0.tag}");
    22322233  suggestAlternative: concat("{0.key}", "=no");

  • trunk/resources/data/validator/ignoretags.cfg

    r17468 r17469  
    703703E:pk
    704704K:amenity=embassy
     705K:shoulder=none
    705706;
    706707; Tags not yet decided (to remove from this section when added or moved up when deprecated)
Note: See TracChangeset for help on using the changeset viewer.