Changeset 9306 in josm


Ignore:
Timestamp:
2016-01-04T18:16:55+01:00 (9 years ago)
Author:
Klumbumbus
Message:

fix #12232 - Add new railway and way icons, by zermes (CC0/PD), icons see [o31936]; drop steps mappaint icon

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r9294 r9306  
    948948    </group> <!-- Streets -->
    949949    <group name="Ways" icon="styles/standard/transport/way/way_unclassified.svg">
    950         <item name="Track" icon="presets/track1.png" type="way,closedway" preset_name_label="true">
     950        <item name="Track" icon="styles/standard/transport/way/track.svg" type="way,closedway" preset_name_label="true">
    951951            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
    952952                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=track"
    … …  
    978978            </optional>
    979979        </item> <!-- Track -->
    980         <item name="Path" icon="presets/path.png" type="way,closedway" preset_name_label="true">
     980        <item name="Path" icon="styles/standard/transport/way/path.svg" type="way,closedway" preset_name_label="true">
    981981            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
    982982                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path"
    … …  
    10161016        </item> <!-- Path -->
    10171017        <separator/>
    1018         <item name="Dedicated Bridleway" icon="presets/equestrian.png" type="way" preset_name_label="true">
     1018        <item name="Dedicated Bridleway" icon="styles/standard/transport/way/dedicated_bridleway.svg" type="way" preset_name_label="true">
    10191019            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway"
    10201020                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=bridleway"
    … …  
    10321032            </optional>
    10331033        </item> <!-- Dedicated Bridleway -->
    1034         <item name="Cycle Lane/Track" type="way" preset_name_label="true">
     1034        <item name="Cycle Lane/Track" icon="styles/standard/transport/way/cycle_lane_track.svg" type="way" type="way" preset_name_label="true">
    10351035            <link href="http://wiki.openstreetmap.org/wiki/Bicycle"
    10361036                  de.href="http://wiki.openstreetmap.org/wiki/DE:Bicycle"
    … …  
    10561056            </optional>
    10571057        </item> <!-- Cycle Lane/Track -->
    1058         <item name="Dedicated Cycleway" icon="presets/cycleway.png" type="way" preset_name_label="true">
     1058        <item name="Dedicated Cycleway" icon="styles/standard/transport/way/dedicated_cycleway.svg" type="way" preset_name_label="true">
    10591059            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
    10601060                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
    … …  
    10741074            </optional>
    10751075        </item> <!-- Dedicated Cycleway -->
    1076         <item name="Segregated Foot- and Cycleway" icon="presets/foot_and_cycleway_segregated.png" type="way" preset_name_label="true">
     1076        <item name="Segregated Foot- and Cycleway" icon="styles/standard/transport/way/segregated_foot_cycleway.svg" type="way" preset_name_label="true">
    10771077            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
    10781078                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
    … …  
    10881088            </optional>
    10891089        </item> <!-- Segregated Foot- and Cycleway -->
    1090         <item name="Combined Foot- and Cycleway" icon="presets/foot_and_cycleway_combined.png" type="way" preset_name_label="true">
     1090        <item name="Combined Foot- and Cycleway" icon="styles/standard/transport/way/combined_foot_cycleway.svg" type="way" preset_name_label="true">
    10911091            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
    10921092                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
    … …  
    11031103            </optional>
    11041104        </item> <!-- Combined Foot- and Cycleway -->
    1105         <item name="Dedicated Footway" icon="presets/footway.png" type="way" preset_name_label="true">
     1105        <item name="Dedicated Footway" icon="styles/standard/transport/way/dedicated_footway.svg" type="way" preset_name_label="true">
    11061106            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
    11071107                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=footway"
    … …  
    11271127            </optional>
    11281128        </item> <!-- Dedicated Footway -->
    1129         <item name="Steps" icon="presets/steps.png" type="way" preset_name_label="true">
     1129        <item name="Steps" icon="styles/standard/transport/way/steps.svg" type="way" preset_name_label="true">
    11301130            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
    11311131                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
    … …  
    23132313    </group> <!-- Shipping -->
    23142314  </group> <!-- Water -->
    2315   <group name="Transport" icon="presets/railway.svg">
    2316     <group name="Railway" icon="presets/railway.svg">
    2317         <item name="Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
     2315  <group name="Transport" icon="styles/standard/transport/railway/rail.svg">
     2316    <group name="Railway" icon="styles/standard/transport/railway/rail.svg">
     2317        <item name="Rail" icon="styles/standard/transport/railway/rail.svg" type="way" preset_name_label="true">
    23182318            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail"
    23192319                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=rail"
    … …  
    23312331            </optional>
    23322332        </item> <!-- Rail -->
    2333         <item name="Narrow Gauge Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
     2333        <item name="Narrow Gauge Rail" icon="styles/standard/transport/railway/narrow_gauge_rail.svg" type="way" preset_name_label="true">
    23342334            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail"
    23352335                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=light_rail"
    … …  
    23412341            </optional>
    23422342        </item> <!-- Narrow Gauge Rail -->
    2343         <item name="Monorail" icon="presets/railway.svg" type="way" preset_name_label="true">
     2343        <item name="Monorail" icon="styles/standard/transport/railway/monorail.svg" type="way" preset_name_label="true">
    23442344            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail"
    23452345                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=monorail"
    … …  
    23522352            </optional>
    23532353        </item> <!-- Monorail -->
    2354         <item name="Preserved" icon="presets/rail_preserved.png" type="way" preset_name_label="true">
     2354        <item name="Preserved" icon="styles/standard/transport/railway/preserved.svg" type="way" preset_name_label="true">
    23552355            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved"
    23562356                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=preserved"
    … …  
    23632363            </optional>
    23642364        </item> <!-- Preserved -->
    2365         <item name="Light Rail" icon="presets/rail_light.png" type="way" preset_name_label="true">
     2365        <item name="Light Rail" icon="styles/standard/transport/railway/light_rail.svg" type="way" preset_name_label="true">
    23662366            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
    23672367            <key key="railway" value="light_rail" />
    … …  
    23702370            </optional>
    23712371        </item> <!-- Light Rail -->
    2372         <item name="Subway" icon="presets/rail_light.png" type="way" preset_name_label="true">
     2372        <item name="Subway" icon="styles/standard/transport/railway/subway.svg" type="way" preset_name_label="true">
    23732373            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway"
    23742374                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway"
    … …  
    23822382            </optional>
    23832383        </item> <!-- Subway -->
    2384         <item name="Tram" icon="presets/tram.png" type="way" preset_name_label="true">
     2384        <item name="Tram" icon="styles/standard/transport/railway/tram.svg" type="way" preset_name_label="true">
    23852385            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram"
    23862386                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram"
    … …  
    23952395            </optional>
    23962396        </item> <!-- Tram -->
    2397         <item name="Bus Guideway" icon="presets/busway.png" type="way" preset_name_label="true">
     2397        <item name="Bus Guideway" icon="styles/standard/transport/railway/bus_guideway.svg" type="way" preset_name_label="true">
    23982398            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway"
    23992399                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_guideway"
    … …  
    24132413        </item> <!-- Bus Guideway -->
    24142414        <separator/>
    2415         <item name="Disused Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
     2415        <item name="Disused Rail" icon="styles/standard/transport/railway/disused_rail.svg" type="way" preset_name_label="true">
    24162416            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused"
    24172417                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=disused"
    … …  
    24222422            </optional>
    24232423        </item> <!-- Disused Rail -->
    2424         <item name="Abandoned Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
     2424        <item name="Abandoned Rail" icon="styles/standard/transport/railway/abandoned_rail.svg" type="way" preset_name_label="true">
    24252425            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
    24262426                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=abandoned"
    … …  
    24342434        </item> <!-- Abandoned Rail -->
    24352435        <separator/>
    2436         <item name="Level Crossing" icon="presets/level_crossing.png" type="node" preset_name_label="true">
     2436        <item name="Level Crossing" icon="styles/standard/transport/railway/level_crossing.svg" type="node" preset_name_label="true">
    24372437            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing"
    24382438                  bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:railway=level_crossing"
    … …  
    24562456            </optional>
    24572457        </item> <!-- Level Crossing -->
    2458         <item name="Crossing" icon="styles/standard/vehicle/crossing.png" type="node" preset_name_label="true">
     2458        <item name="Crossing" icon="styles/standard/transport/railway/crossing.svg" type="node" preset_name_label="true">
    24592459            <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
    24602460                  bg.href="http://wiki.openstreetmap.org/wiki/Bg:Key:crossing"
    … …  
    24752475            </optional>
    24762476        </item> <!-- Crossing -->
    2477         <item name="Turntable" icon="presets/turntable.png" type="node,closedway" preset_name_label="true">
     2477        <item name="Turntable" icon="styles/standard/transport/railway/turntable.svg" type="node,closedway" preset_name_label="true">
    24782478            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable"
    24792479                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=turntable"
    … …  
    24832483            <key key="railway" value="turntable" />
    24842484        </item> <!-- Turntable -->
    2485         <item name="Buffer Stop" icon="styles/standard/transport/buffer_stop.png" type="node" preset_name_label="true">
     2485        <item name="Buffer Stop" icon="styles/standard/transport/railway/buffer_stop.svg" type="node" preset_name_label="true">
    24862486            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=buffer_stop"
    24872487                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=buffer_stop"
    … …  
    24892489            <key key="railway" value="buffer_stop" />
    24902490        </item> <!-- Buffer Stop -->
    2491         <item name="Railway Switch" icon="presets/railway_switch.svg" type="node" preset_name_label="true">
     2491        <item name="Railway Switch" icon="styles/standard/transport/railway/switch.svg" type="node" preset_name_label="true">
    24922492            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=switch"
    24932493                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=switch"
    … …  
    24972497            <text key="operator" text="Operator" />
    24982498        </item> <!-- Railway Switch -->
    2499         <item name="Railway Signal" icon="styles/standard/vehicle/railway_signal.svg" type="node" preset_name_label="true">
     2499        <item name="Railway Signal" icon="styles/standard/transport/railway/signal.svg" type="node" preset_name_label="true">
    25002500            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=signal"
    25012501                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=signal" />
    … …  
    25042504            <text key="operator" text="Operator" />
    25052505        </item> <!-- Railway Signal -->
    2506         <item name="Railway milestone" icon="styles/standard/vehicle/milestone.svg" type="node" preset_name_label="true">
     2506        <item name="Railway milestone" icon="styles/standard/transport/railway/milestone.svg" type="node" preset_name_label="true">
    25072507            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=milestone" />
    25082508            <key key="railway" value="milestone" />

  • trunk/styles/standard/elemstyles.mapcss

    r9302 r9306  
    646646    color: foot#00ff00;
    647647    dashes: 2,2;
    648 }
    649 node[highway=steps] {
    650     icon-image: "transport/steps.png";
    651     set icon_z17;
    652     text: auto;
    653648}
    654649way[highway=bus_guideway] {
    … …  
    34773472}
    34783473node[railway=crossing] {
    3479     icon-image: "vehicle/crossing.png";
     3474    icon-image: "transport/railway/crossing.svg";
    34803475    set icon_z17;
    34813476    text: auto;
    34823477}
    34833478node[railway=level_crossing] {
    3484     icon-image: "presets/level_crossing.png";
     3479    icon-image: "transport/railway/level_crossing.svg";
    34853480    icon-width: 16;
    34863481    set icon_z17;
    … …  
    35533548}
    35543549node[railway=turntable] {
    3555     icon-image: "transport/turntable.png";
     3550    icon-image: "transport/railway/turntable.svg";
    35563551    set icon_z17;
    35573552    text: auto;
    35583553}
    35593554node[railway=buffer_stop] {
    3560     icon-image: "transport/buffer_stop.png";
     3555    icon-image: "transport/railway/buffer_stop.svg";
    35613556    set icon_z17;
    35623557    text: auto;
    … …  
    35753570}
    35763571node[railway=switch] {
    3577     icon-image: "presets/railway_switch.svg";
     3572    icon-image: "transport/railway/switch.svg";
    35783573    icon-width: 16;
    35793574    set icon_z17;
    … …  
    35813576}
    35823577node[railway=signal] {
    3583     icon-image: "vehicle/railway_signal.svg";
     3578    icon-image: "transport/railway/signal.svg";
    35843579    set icon_z17;
    35853580    text: auto;
    35863581}
    35873582node[railway=milestone] {
    3588     icon-image: "vehicle/milestone.svg";
     3583    icon-image: "transport/railway/milestone.svg";
    35893584    set icon_z17;
    35903585    text: auto;
Note: See TracChangeset for help on using the changeset viewer.