Changeset 8725 in josm for trunk/data


Ignore:
Timestamp:
2015-09-03T23:05:24+02:00 (9 years ago)
Author:
Klumbumbus
Message:

fix #8717 - add highway=milestone and railway=milestone to preset and mappaint style; add numerical validator tests and fix for pk/kp => distance; prefer distance before ref as text in MapView; typo

Location:
trunk/data
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r8707 r8725  
    12771277            <key key="highway" value="traffic_mirror" />
    12781278        </item> <!-- Traffic Mirror -->
     1279        <item name="Highway milestone" icon="styles/standard/vehicle/milestone.svg" type="node" preset_name_label="true">
     1280            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=milestone" />
     1281            <key key="highway" value="milestone" />
     1282            <text key="distance" text="Distance (kilometers)" />
     1283            <text key="ref" text="Reference" />
     1284        </item> <!-- Highway Milestone -->
    12791285        <item name="Named Junction" name_context="junction=yes" type="node,closedway" preset_name_label="true">
    12801286            <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=yes"
     
    23532359            <text key="ref" text="Reference" />
    23542360        </item> <!-- Railway Switch -->
     2361        <item name="Railway milestone" icon="styles/standard/vehicle/milestone.svg" type="node" preset_name_label="true">
     2362            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=milestone" />
     2363            <key key="railway" value="milestone" />
     2364            <text key="distance" text="Distance (kilometers)" />
     2365            <text key="ref" text="Reference" />
     2366        </item> <!-- Railway Milestone -->
    23552367    </group> <!-- Railway -->
    23562368    <group name="Aerialway" icon="presets/aerialway.png">
  • trunk/data/validator/deprecated.mapcss

    r8699 r8725  
    513513  suggestAlternative: "...";
    514514}
     515
     516/* see #8717 */
     517*[kp][highway=milestone],
     518*[kp][railway=milestone],
     519*[kp][waterway=milestone] {
     520  throwWarning: tr("{0} is deprecated", "{0.key}");
     521  suggestAlternative: "distance";
     522  fixChangeKey: "kp => distance";
     523}
     524*[pk][highway=milestone],
     525*[pk][railway=milestone],
     526*[pk][waterway=milestone] {
     527  throwWarning: tr("{0} is deprecated", "{0.key}");
     528  suggestAlternative: "distance";
     529  fixChangeKey: "pk => distance";
     530}
  • trunk/data/validator/numeric.mapcss

    r8701 r8725  
    8282}
    8383*[maxweight][maxweight !~ /^(([0-9]+\.?[0-9]*( (t|kg|lbs))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
    84   throwWarning: tr("{0}: meters is default; period is separator; if units, put space then unit", "maxweight");
     84  throwWarning: tr("{0}: tonne is default; period is separator; if units, put space then unit", "maxweight");
    8585  assertMatch: "way maxweight=something";
    8686  assertMatch: "way maxweight=-5";
     
    106106  assertNoMatch: "way maxspeed=none";
    107107  assertNoMatch: "way maxspeed=variable";
     108}
     109
     110*[distance][distance !~ /^(([0-9]+\.?[0-9]*( (km|mi|nmi))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
     111  throwWarning: tr("{0}: kilometers is default; period is separator; if units, put space then unit", "distance");
     112  assertMatch: "way distance=something";
     113  assertMatch: "way distance=-5";
     114  assertNoMatch: "way distance=2";
     115  assertNoMatch: "way distance=2.5";
     116  assertNoMatch: "way distance=7 mi";
    108117}
    109118
Note: See TracChangeset for help on using the changeset viewer.