Changeset 11025 in josm for trunk/data


Ignore:
Timestamp:
2016-09-18T22:05:48+02:00 (3 years ago)
Author:
Klumbumbus
Message:

fix #13653 - use emergency_telephone_code instead of phone for highway=emergency_access_point

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r11010 r11025  
    49084908            <text key="name" text="Point Name" />
    49094909            <text key="operator" text="Operator" />
    4910             <text key="phone" text="Phone Number" />
    4911             <label text="(Use international code, like +12-345-67890)" />
     4910            <text key="emergency_telephone_code" text="Emergency Phone Number" />
     4911            <label text="(Use number as shown on plate.)" />
    49124912            <space />
    49134913        </item> <!-- Emergency Access Point -->
  • trunk/data/validator/deprecated.mapcss

    r10916 r11025  
    909909  fixAdd: "vending=animal_feed";
    910910}
     911
     912/* #13653 */
     913node[highway=emergency_access_point][phone][!emergency_telephone_code],
     914way[highway=emergency_access_point][phone][!emergency_telephone_code] {
     915  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
     916  suggestAlternative: "emergency_telephone_code";
     917  fixChangeKey: "phone => emergency_telephone_code";
     918  assertMatch:   "node highway=emergency_access_point phone=123";
     919  assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=456";
     920  assertNoMatch: "node highway=emergency_access_point phone=123 emergency_telephone_code=456";
     921  assertNoMatch: "node phone=123";
     922}
     923node[highway=emergency_access_point][phone=*emergency_telephone_code],
     924way[highway=emergency_access_point][phone=*emergency_telephone_code] {
     925  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
     926  suggestAlternative: "emergency_telephone_code";
     927  fixRemove: "phone";
     928  assertNoMatch: "node highway=emergency_access_point phone=123";
     929  assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=123";
     930  assertMatch:   "node highway=emergency_access_point phone=123 emergency_telephone_code=123";
     931}
     932node[highway=emergency_access_point][phone][emergency_telephone_code][phone!=*emergency_telephone_code],
     933way[highway=emergency_access_point][phone][emergency_telephone_code][phone!=*emergency_telephone_code] {
     934  throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
     935  suggestAlternative: "emergency_telephone_code";
     936  assertNoMatch: "node highway=emergency_access_point phone=123";
     937  assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=123";
     938  assertNoMatch: "node highway=emergency_access_point phone=123 emergency_telephone_code=123";
     939}
Note: See TracChangeset for help on using the changeset viewer.