Changeset 7977 in josm


Ignore:
Timestamp:
2015-01-22T00:34:42+01:00 (5 years ago)
Author:
Klumbumbus
Message:

see #10835 - icon unification and geometry consistency for some transport related tags (railway, aeroway,...). add validator warnings

Location:
trunk
Files:
2 added
5 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7976 r7977  
    21402140            </optional>
    21412141        </item> <!-- Level Crossing -->
    2142         <item name="Crossing" icon="presets/crossing.png" type="node" preset_name_label="true">
     2142        <item name="Crossing" icon="styles/standard/vehicle/crossing.png" type="node" preset_name_label="true">
    21432143            <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
    21442144                  bg.href="http://wiki.openstreetmap.org/wiki/Bg:Key:crossing"
     
    27432743            </optional>
    27442744        </item> <!-- Subway Entrance -->
    2745         <item name="Ticket Machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
     2745        <item name="Ticket Machine" icon="styles/standard/transport/ticket-machine.png" type="node" preset_name_label="true">
    27462746            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
    27472747                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
  • trunk/data/validator/geometry.mapcss

    r7975 r7977  
    1717node[aerialway=rope_tow],
    1818node[aerialway=goods],
     19node[aeroway=taxiway],
     20node[aeroway=runway],
     21node[railway=rail],
     22node[railway=narrow_gauge],
     23node[railway=monorail],
     24node[railway=preserved],
     25node[railway=light_rail],
     26node[railway=subway],
     27node[railway=tram],
     28node[railway=disused],
     29node[railway=abandoned],
    1930node[waterway=river],
    2031node[waterway=canal],
     
    5162node[man_made=bridge],
    5263node[man_made=breakwater],
     64node[aeroway=apron],
    5365node[power=plant],
    5466node[source:outline] {
     
    6678way[man_made=survey_point],
    6779way[power=pole],
     80way[amenity=vending_machine],
    6881way[natural=peak],
    6982way[natural=saddle],
  • trunk/data/validator/highway.mapcss

    r7937 r7977  
    3838}
    3939
    40 way[highway=crossing], way[railway=crossing] {
     40way[highway=crossing],
     41way[railway=crossing],
     42way[railway=level_crossing] {
    4143  throwWarning: tr("wrong crossing tag on a way");
    4244  assertMatch: "way highway=crossing";
  • trunk/styles/standard/elemstyles.mapcss

    r7976 r7977  
    21602160area[amenity=car_wash],
    21612161area[amenity=taxi],
    2162 area[amenity=fuel],
    2163 area[amenity=charging_station] {
     2162area[amenity=fuel] {
    21642163    fill-color: amenity_traffic#f7efb7;
    21652164}
     
    26422641area[amenity=shelter],
    26432642area[amenity=marketplace],
    2644 area[amenity=wlan],
    2645 area[amenity=vending_machine] {
     2643area[amenity=wlan] {
    26462644    fill-color: amenity_light#f7efb7;
    26472645}
     
    31573155/****************/
    31583156
    3159 area[railway=station], area[railway=tram_station],
    3160 area[railway=subway_entrance],
    3161 area[railway=crossing], area[railway=level_crossing] {
     3157area[railway=station],
     3158area[railway=tram_station],
     3159area[railway=subway_entrance] {
    31623160    fill-color: railwaypoint#f7efb7;
    31633161}
     
    31833181}
    31843182node[railway=crossing] {
    3185     icon-image: "vehicle/crossing_small.png";
     3183    icon-image: "vehicle/crossing.png";
    31863184    set icon_z17;
    31873185    text: auto;
    31883186}
    31893187node[railway=level_crossing] {
    3190     icon-image: "vehicle/crossing.png";
     3188    icon-image: "presets/level_crossing.png";
     3189    icon-width: 16;
    31913190    set icon_z17;
    31923191    text: auto;
     
    32543253    dashes: 9,9;
    32553254}
    3256 area[railway=turntable],
    3257 area[railway=buffer_stop] {
     3255area[railway=turntable] {
    32583256    fill-color: rail#404040;
    32593257}
     
    32793277    color: rail#404040;
    32803278    dashes: 9,9;
     3279}
     3280node[railway=switch] {
     3281    icon-image: "presets/railway_switch.png";
     3282    icon-width: 16;
     3283    set icon_z17;
     3284    text: auto;
    32813285}
    32823286node[railway=rail], node[railway=tram], node[railway=light_rail],
     
    33203324/****************/
    33213325
    3322 area[aeroway=aerodrome]:closed {
     3326area[aeroway=aerodrome] {
    33233327    fill-color: aeroway#660000;
    3324 }
    3325 way[aeroway=aerodrome] {
    33263328    width: 2;
    3327     color: aeroway#660000;
    33283329    dashes: 9,9;
    33293330}
     
    33563357    color: aeroway_dark#330000;
    33573358}
    3358 node[aeroway=runway] {
    3359     icon-image: "transport/airport/runway.png";
    3360     set icon_z17;
    3361     text: auto;
    3362 }
    33633359area[aeroway=taxiway]:closed {
    33643360    fill-color: aeroway#660000;
     
    33683364    color: aeroway#660000;
    33693365}
     3366area[aeroway=apron],
     3367area[aeroway=hangar] {
     3368    fill-color: aeroway_light#990000;
     3369}
     3370node[aeroway=apron],
     3371node[aeroway=runway],
    33703372node[aeroway=taxiway] {
    3371     icon-image: "transport/airport/taxiway.png";
    3372     set icon_z17;
    3373     text: auto;
    3374 }
    3375 area[aeroway=apron], area[aeroway=hangar] {
    3376     fill-color: aeroway_light#990000;
    3377 }
    3378 node[aeroway=apron] {
    3379     icon-image: "transport/airport/apron.png";
     3373    icon-image: "misc/deprecated.png";
    33803374    set icon_z17;
    33813375    text: auto;
Note: See TracChangeset for help on using the changeset viewer.