Changeset 7707 in josm


Ignore:
Timestamp:
2014-11-04T22:58:11+01:00 (5 years ago)
Author:
Klumbumbus
Message:

fix #10716 - add 'sidewalk' to appropriate highway presets; add validator warning for sidewalk=*on nodes and sidewalk=yes.

Location:
trunk/data
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r7705 r7707  
    4444        <reference ref="highway_yesno_incline_oneway_lit" />
    4545        <text key="width" text="Width (meters)" />
     46    </chunk>
     47    <chunk id="highway_yesno_incline_oneway_lit_width_sidewalk">
     48        <reference ref="highway_yesno_incline_oneway_lit_width" />
     49        <combo key="sidewalk" text="Sidewalk" values="both,left,right,no" values_context="sidewalk" />
    4650    </chunk>
    4751    <chunk id="railway_service">
    … …  
    442446                <reference ref="highway_base" />
    443447                <check key="motorroad" text="Motorroad" />
    444                 <reference ref="highway_yesno_incline_oneway_lit_width" />
     448                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    445449            </optional>
    446450        </item> <!-- Primary -->
    … …  
    457461                <reference ref="highway_base" />
    458462                <check key="motorroad" text="Motorroad" />
    459                 <reference ref="highway_yesno_incline_oneway_lit_width" />
     463                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    460464            </optional>
    461465        </item> <!-- Primary Link -->
    … …  
    478482                <text key="name" text="Name" />
    479483                <reference ref="highway_base" />
    480                 <reference ref="highway_yesno_incline_oneway_lit_width" />
     484                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    481485            </optional>
    482486        </item> <!-- Secondary -->
    … …  
    492496            <optional>
    493497                <reference ref="highway_base" />
    494                 <reference ref="highway_yesno_incline_oneway_lit_width" />
     498                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    495499            </optional>
    496500        </item> <!-- Secondary Link -->
    … …  
    513517                <text key="name" text="Name" />
    514518                <reference ref="highway_base" />
    515                 <reference ref="highway_yesno_incline_oneway_lit_width" />
     519                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    516520            </optional>
    517521        </item> <!-- Tertiary -->
    … …  
    527531            <optional>
    528532                <reference ref="highway_base" />
    529                 <reference ref="highway_yesno_incline_oneway_lit_width" />
     533                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    530534            </optional>
    531535        </item> <!-- Tertiary Link -->
    … …  
    545549                <text key="ref" text="Reference" />
    546550                <reference ref="highway_base" />
    547                 <reference ref="highway_yesno_incline_oneway_lit_width" />
     551                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    548552                <check key="passing_places" text="Passing Places" />
    549553            </optional>
    … …  
    566570                <text key="ref" text="Reference" />
    567571                <reference ref="highway_base" />
    568                 <reference ref="highway_yesno_incline_oneway_lit_width" />
     572                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    569573            </optional>
    570574        </item> <!-- Residential -->
    … …  
    589593                <check key="lit" text="Lit" />
    590594                <text key="width" text="Width (meters)" />
     595                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no" values_context="sidewalk" />
    591596            </optional>
    592597        </item> <!-- Bicycle Road -->
    … …  
    649654                <text key="name" text="Name" />
    650655                <reference ref="highway_base" />
    651                 <reference ref="highway_yesno_incline_oneway_lit_width" />
     656                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    652657                <check key="passing_places" text="Passing Places" />
    653658            </optional>
    … …  
    683688                <text key="name" text="Name" />
    684689                <reference ref="highway_base" />
    685                 <reference ref="highway_yesno_incline_oneway_lit_width" />
     690                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    686691            </optional>
    687692        </item> <!-- Road (Unknown Type) -->
    … …  
    699704                <text key="name" text="Name" />
    700705                <reference ref="highway_base" />
    701                 <reference ref="highway_yesno_incline_oneway_lit_width" />
     706                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    702707                <combo key="junction" text="Junction" values="roundabout,jughandle,yes" />
    703708            </optional>

  • trunk/data/validator/deprecated.mapcss

    r7697 r7707  
    340340  fixChangeKey: "place_name => name";
    341341}
     342
     343way[sidewalk=yes] {
     344  throwWarning: tr("{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or ''both''.", "{0.key}", "{0.value}");
     345}

  • trunk/data/validator/geometry.mapcss

    r7651 r7707  
    33node[bridge?],
    44node[landuse],
     5node[sidewalk],
    56node[source:outline] {
    67  throwWarning: tr("{0} on a node", "{0.key}");
Note: See TracChangeset for help on using the changeset viewer.