Changeset 10429 in josm


Ignore:
Timestamp:
2016-06-19T19:03:05+02:00 (8 years ago)
Author:
Klumbumbus
Message:

see #11006 - rework of public transport mappaint style and presets, mainly icon improvements, prioritise ptv2 over legacy, drop transport types for platform

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r10366 r10429  
    32103210        </item> <!-- Stop Area -->
    32113211        <separator/>
    3212         <item name="Stop Position" type="node" icon="presets/barrier.png" preset_name_label="true">
     3212        <item name="Stop Position" type="node" icon="styles/standard/transport/railway_small.png" preset_name_label="true">
    32133213            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_position" />
    32143214            <space />
     
    32383238            <check key="ferry" text="Ferry" />
    32393239        </item> <!-- Stop Position -->
    3240         <item name="Platform" type="node,way,closedway,multipolygon" icon="presets/platform_bus.png" preset_name_label="true">
     3240        <item name="Platform" type="node,way,closedway,multipolygon" icon="styles/standard/transport/platform.svg" preset_name_label="true">
    32413241            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform" />
    32423242            <space />
     
    32493249            <reference ref="wheelchair" />
    32503250            <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
    3251             <optional>
    3252                 <text key="ref" text="Reference" />
    3253                 <text key="uic_ref" text="UIC reference" />
    3254                 <text key="uic_name" text="UIC name" />
    3255                 <text key="operator" text="Operator" />
    3256                 <text key="network" text="Network" />
    3257                 <space/>
    3258                 <check key="bus" text="Bus" />
    3259                 <check key="highway" value_on="platform" text="Highway platform (legacy)" />
    3260                 <check key="tram" text="Tram" />
    3261                 <check key="train" text="Train" />
    3262                 <check key="railway" value_on="platform" text="Railway platform (legacy)" />
    3263                 <check key="trolleybus" text="Trolleybus" />
    3264                 <check key="share_taxi" text="Share taxi" />
    3265                 <check key="subway" text="Subway" />
    3266                 <check key="monorail" text="Monorail" />
    3267                 <check key="funicular" text="funicular" />
    3268                 <check key="aerialway" text="aerialway" />
    3269                 <check key="ferry" text="ferry" />
    3270             </optional>
    32713251        </item> <!-- Platform -->
    3272         <item name="Station" name_context="railway" type="node,closedway,multipolygon" icon="styles/standard/transport/railway_station.png" preset_name_label="true">
     3252        <item name="Station" name_context="railway" type="node,closedway,multipolygon" icon="styles/standard/transport/station.svg" preset_name_label="true">
    32733253            <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"
    32743254                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:public_transport=station"
     
    33563336            </optional>
    33573337        </item> <!-- Station -->
    3358         <item name="Railway Halt" icon="presets/station.png" type="node" preset_name_label="true">
     3338        <item name="Railway Halt" icon="styles/standard/transport/railway_small.png" type="node" preset_name_label="true">
    33593339            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt"
    33603340                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=halt"
     
    33673347            </optional>
    33683348        </item> <!-- Railway Halt -->
    3369         <item name="Tram Stop" icon="presets/tram.png" type="node" preset_name_label="true">
     3349        <item name="Tram Stop" icon="styles/standard/transport/tram.png" type="node" preset_name_label="true">
    33703350           <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
    33713351                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop"
  • trunk/data/validator/geometry.mapcss

    r10427 r10429  
    8181/* {0} on a way, should be a node */
    8282way[entrance],
     83way[railway=subway_entrance],
    8384way[man_made=survey_point],
    8485way[power=transformer],
  • trunk/styles/standard/elemstyles.mapcss

    r10419 r10429  
    32783278}
    32793279
    3280 /*************************/
    3281 /* public_transport tags */
    3282 /*************************/
    3283 
    3284 node[public_transport=stop_position] {
    3285     icon-image: "transport/railway_small.png";
    3286     set icon_z17;
    3287 }
    3288 node[highway=bus_stop] {
    3289     icon-image: "transport/bus_small.png";
    3290     set icon_z17;
    3291 }
    3292 node[public_transport=stop_position][bus=yes] {
    3293     icon-image: "transport/bus_small.png";
    3294     set icon_z17;
    3295 }
    3296 node[public_transport=stop_position][aerial=yes] {
    3297     icon-image: "transport/aerialway.png";
    3298     set icon_z17;
    3299 }
    3300 node[public_transport=stop_position][ferry=yes] {
    3301     icon-image: "transport/ferry.png";
    3302     set icon_z17;
    3303 }
    3304 node[public_transport=stop_position][tram=yes] {
    3305     icon-image: "transport/tram.png";
    3306     set icon_z17;
    3307 }
    3308 node[public_transport=stop_position][train=yes] {
    3309     icon-image: "transport/railway_small.png";
    3310     set icon_z17;
    3311 }
    3312 area[public_transport=platform]:closed {
    3313     fill-color: service#809bc0;
    3314 }
    3315 way[public_transport=platform]!:closed {
    3316     width: 3;
    3317     color: service#809bc0;
    3318     dashes: 12,3;
    3319 }
    3320 node[public_transport=platform] {
    3321     icon-image: "transport/bus_small.png";
    3322     set icon_z17;
    3323 }
    3324 node[public_transport=platform][bus=yes] {
    3325     icon-image: "transport/bus_small.png";
    3326     set icon_z17;
    3327 }
    3328 node[public_transport=platform][aerial=yes] {
    3329     icon-image: "transport/aerialway/station.png";
    3330     set icon_z17;
    3331 }
    3332 node[public_transport=platform][ferry=yes] {
    3333     icon-image: "transport/ferry.png";
    3334     set icon_z17;
    3335 }
    3336 node[public_transport=platform][tram=yes],
    3337 node[public_transport=platform][train=yes] {
    3338     icon-image: "transport/railway_station.png";
    3339     set icon_z17;
    3340 }
    3341 
    33423280/****************/
    33433281/* railway tags */
    33443282/****************/
    33453283
    3346 area[railway=station],
    3347 area[railway=tram_station],
    3348 area[railway=subway_entrance] {
     3284area[railway=station] {
    33493285    fill-color: railwaypoint#f7efb7;
    33503286}
    3351 node[railway=station], node[railway=tram_station] {
     3287node[railway=station] {
    33523288    icon-image: "transport/railway_station.png";
    33533289    set icon_z17;
     
    36793615node[aerialway=goods] {
    36803616    icon-image: "misc/deprecated.png";
     3617    set icon_z17;
     3618}
     3619
     3620/*************************/
     3621/* public_transport tags */
     3622/*************************/
     3623
     3624node[highway=bus_stop] {
     3625    icon-image: "transport/bus_small.png";
     3626    set icon_z17;
     3627}
     3628node[public_transport=stop_position] {
     3629    icon-image: "transport/railway_small.png";
     3630    set icon_z17;
     3631}
     3632node[public_transport=stop_position][train=yes] {
     3633    icon-image: "transport/train.svg";
     3634    set icon_z17;
     3635}
     3636node[public_transport=stop_position][subway=yes] {
     3637    icon-image: "transport/railway/subway.svg";
     3638    set icon_z17;
     3639}
     3640node[public_transport=stop_position][monorail=yes] {
     3641    icon-image: "transport/railway/monorail.svg";
     3642    set icon_z17;
     3643}
     3644node[public_transport=stop_position][tram=yes] {
     3645    icon-image: "transport/railway/tram.svg";
     3646    set icon_z17;
     3647}
     3648node[public_transport=stop_position][bus=yes] {
     3649    icon-image: "transport/bus.svg";
     3650    set icon_z17;
     3651}
     3652node[public_transport=stop_position][trolleybus=yes] {
     3653    icon-image: "transport/trolleybus.svg";
     3654    set icon_z17;
     3655}
     3656node[public_transport=stop_position][aerialway=yes] {
     3657    icon-image: "transport/aerialway/station.png";
     3658    set icon_z17;
     3659}
     3660node[public_transport=stop_position][ferry=yes] {
     3661    icon-image: "nautical/ferry.png";
     3662    icon-width: 16;
     3663    set icon_z17;
     3664}
     3665area[public_transport=platform]:closed {
     3666    fill-color: service#809bc0;
     3667}
     3668way[public_transport=platform]!:closed {
     3669    width: 3;
     3670    color: service#809bc0;
     3671    dashes: 12,3;
     3672}
     3673node[public_transport=platform] {
     3674    icon-image: "transport/platform.svg";
     3675    set icon_z17;
     3676}
     3677area[public_transport=station] {
     3678    fill-color: railwaypoint#f7efb7;
     3679}
     3680node[public_transport=station] {
     3681    icon-image: "transport/station.svg";
    36813682    set icon_z17;
    36823683}
Note: See TracChangeset for help on using the changeset viewer.