Changeset 15273 in josm


Ignore:
Timestamp:
2019-08-03T21:54:18+02:00 (3 weeks ago)
Author:
Klumbumbus
Message:

fix #17330 - replace crossing=island by crossing:island=yes

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r15272 r15273  
    10971097            </optional>
    10981098            <optional text="Optional crossing attributes:">
    1099                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no" />
     1099                <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,unmarked,no" />
    11001100                <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
     1101                <check key="crossing:island" text="With island" />
    11011102                <check key="button_operated" text="Button operated" />
    11021103                <check key="traffic_signals:sound" text="Sound signals" />
     
    11401141                <list_entry value="uncontrolled" icon="presets/vehicle/crossing.svg" />
    11411142                <list_entry value="traffic_signals" icon="presets/vehicle/crossing_traffic_signals.svg" />
    1142                 <list_entry value="island" icon="presets/vehicle/crossing_island.svg" />
    11431143                <list_entry value="unmarked" icon="presets/vehicle/crossing_unmarked.svg" />
    11441144            </combo>
     
    11461146            <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
    11471147            <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
     1148            <check key="crossing:island" text="With island" />
    11481149            <check key="bicycle" text="Cross by bicycle" />
    11491150            <check key="horse" text="Cross on horseback" />
     
    19631964            <key key="railway" value="crossing" />
    19641965            <optional>
    1965                 <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no" />
     1966                <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals" />
    19661967                <reference ref="supervised" />
    19671968                <check key="horse" text="Cross on horseback" />
  • trunk/data/validator/deprecated.mapcss

    r15270 r15273  
    17391739  fixAdd: "access=yes";
    17401740}
     1741
     1742/* #17330 */
     1743*[crossing=island] {
     1744  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1745  suggestAlternative: "crossing:island=yes";
     1746  group: tr("deprecated tagging");
     1747  fixRemove: "crossing";
     1748  fixAdd: "crossing:island=yes";
     1749}
  • trunk/styles/standard/elemstyles.mapcss

    r15269 r15273  
    732732    set icon_z17;
    733733}
     734node[highway=traffic_signals][crossing:island=yes] {
     735    icon-image: "presets/vehicle/traffic_signals_crossing_island.svg";
     736    set icon_z17;
     737}
    734738node[highway=traffic_signals][crossing_ref=zebra] {
    735739    icon-image: "presets/vehicle/traffic_signals_crossing_ref_zebra.svg";
    736740    set icon_z17;
    737741}
    738 node[highway=traffic_signals][crossing=island] {
    739     icon-image: "presets/vehicle/traffic_signals_crossing_island.svg";
    740     set icon_z17;
    741 }
    742742node[highway=traffic_signals][crossing=traffic_signals] {
    743743    icon-image: "presets/vehicle/traffic_signals_crossing_traffic_signals.svg";
     
    768768    set icon_z17;
    769769}
     770node[highway=crossing][crossing:island=yes] {
     771    icon-image: "presets/vehicle/crossing_island.svg";
     772    set icon_z17;
     773}
    770774node[highway=crossing][crossing=unmarked] {
    771775    icon-image: "presets/vehicle/crossing_unmarked.svg";
    772     set icon_z17;
    773 }
    774 node[highway=crossing][crossing=island] {
    775     icon-image: "presets/vehicle/crossing_island.svg";
    776776    set icon_z17;
    777777}
Note: See TracChangeset for help on using the changeset viewer.