Changeset 9506 in josm


Ignore:
Timestamp:
2016-01-17T18:09:00+01:00 (9 years ago)
Author:
Klumbumbus
Message:

see #12296 - add new water and waypoint icons (by zermes), move old icons to nodist folder; see also [o31996]; add warning for traffic_calming=yes; remove power.mapcss test (see #12386)

Location:
trunk
Files:
14 added
3 deleted
4 edited
8 moved

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r9500 r9506  
    11701170        </item> <!-- Steps -->
    11711171    </group> <!-- Ways -->
    1172     <group name="Waypoints" icon="presets/waypoints.png">
     1172    <group name="Waypoints" icon="styles/standard/vehicle/waypoints.svg">
    11731173        <item name="Motorway Junction" icon="styles/standard/vehicle/motorway_junction.svg" type="node" preset_name_label="true">
    11741174            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction"
    … …  
    11851185            <text key="exit_to" text="Exit to" />
    11861186        </item> <!-- Motorway Junction -->
    1187         <item name="Services" icon="styles/standard/vehicle/services.png" type="node,closedway,relation" preset_name_label="true">
     1187        <item name="Services" icon="styles/standard/vehicle/services.svg" type="node,closedway,relation" preset_name_label="true">
    11881188            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services"
    11891189                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=services"
    … …  
    12001200            </optional>
    12011201        </item> <!-- Services -->
    1202         <item name="Rest Area" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
     1202        <item name="Rest Area" icon="styles/standard/vehicle/rest_area.svg" type="node,closedway" preset_name_label="true">
    12031203            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area"
    12041204                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=rest_area"
    … …  
    12401240            </optional>
    12411241            </item> <!-- Traffic Signal -->
    1242         <item name="Stop" icon="presets/Stop.png" type="node" preset_name_label="true">
     1242        <item name="Stop" icon="styles/standard/vehicle/restriction/stop.svg" type="node" preset_name_label="true">
    12431243            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stop"
    12441244                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=stop"
    … …  
    12491249            <key key="highway" value="stop" />
    12501250        </item> <!-- Stop -->
    1251         <item name="Give Way" icon="styles/standard/vehicle/restriction/right_of_way.png" type="node" preset_name_label="true">
     1251        <item name="Give Way" icon="styles/standard/vehicle/restriction/give_way.svg" type="node" preset_name_label="true">
    12521252            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=give_way"
    12531253                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=give_way"
    … …  
    12921292            <check key="traffic_signals:sound" text="Sound signals" />
    12931293        </item> <!-- Pedestrian Crossing -->
    1294         <item name="Traffic Calming" icon="styles/standard/vehicle/traffic_calming_blue.png" type="node,way" preset_name_label="true">
     1294        <item name="Traffic Calming" icon="styles/standard/vehicle/choker.svg" type="node,way" preset_name_label="true">
    12951295            <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
    12961296                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:traffic_calming"
    … …  
    13061306                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
    13071307            <space />
    1308             <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,island,rumble_strip,table" match="key" values_searchable="true" />
     1308            <combo key="traffic_calming" text="Type" match="key" values_searchable="true">
     1309                <list_entry value="yes" display_value="yes - choose a specific value instead if possible" icon="styles/standard/vehicle/traffic_calming.svg" />
     1310                <list_entry value="bump" icon="styles/standard/vehicle/bump.svg" />
     1311                <list_entry value="chicane" icon="styles/standard/vehicle/chicane.svg" />
     1312                <list_entry value="choker" icon="styles/standard/vehicle/choker.svg" />
     1313                <list_entry value="cushion" icon="styles/standard/vehicle/cushion.svg" />
     1314                <list_entry value="hump" icon="styles/standard/vehicle/hump.svg" />
     1315                <list_entry value="island" icon="styles/standard/vehicle/island.svg" />
     1316                <list_entry value="rumble_strip" icon="styles/standard/vehicle/rumble_strip.svg" />
     1317                <list_entry value="table" icon="styles/standard/vehicle/table.svg" />
     1318            </combo>
    13091319        </item> <!-- Traffic Calming -->
    1310         <item name="Passing Place" icon="presets/passingplace.png" type="node" preset_name_label="true">
     1320        <item name="Passing Place" icon="styles/standard/vehicle/passing_place.svg" type="node" preset_name_label="true">
    13111321            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"
    13121322                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=passing_place"
    … …  
    13151325            <key key="highway" value="passing_place" />
    13161326        </item> <!-- Passing Place -->
    1317         <item name="Turning Circle" icon="styles/standard/vehicle/turning_circle.png" type="node" preset_name_label="true">
     1327        <item name="Turning Circle" icon="styles/standard/vehicle/turning_circle.svg" type="node" preset_name_label="true">
    13181328            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
    13191329                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle"
    … …  
    13251335            <key key="highway" value="turning_circle" />
    13261336        </item> <!-- Turning Circle -->
    1327         <item name="Turning Loop" icon="styles/standard/vehicle/turning_loop.png" type="node" preset_name_label="true">
     1337        <item name="Turning Loop" icon="styles/standard/vehicle/turning_loop.svg" type="node" preset_name_label="true">
    13281338            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_loop"
    13291339                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_loop"
    … …  
    13311341            <key key="highway" value="turning_loop" />
    13321342        </item> <!-- Turning Loop -->
    1333         <item name="City Limit Sign" icon="presets/citylimit.png" type="node" preset_name_label="true">
     1343        <item name="City Limit Sign" icon="styles/standard/vehicle/restriction/city_limit.svg" type="node" preset_name_label="true">
    13341344            <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_sign"
    13351345                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
    … …  
    13441354            <text key="alt_name" text="Second Name" />
    13451355        </item> <!-- City Limit -->
    1346         <item name="Speed Limit Sign" icon="styles/standard/vehicle/restriction/speed.png" type="node" preset_name_label="true">
     1356        <item name="Speed Limit Sign" icon="styles/standard/vehicle/restriction/maxspeed.svg" type="node" preset_name_label="true">
    13471357            <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_sign"
    13481358                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
    … …  
    13561366            <text key="maxspeed" text="Max. speed (km/h)" />
    13571367        </item> <!-- Speed Limit -->
    1358         <item name="Speed Camera" icon="presets/speed_camera.png" type="node" preset_name_label="true">
     1368        <item name="Speed Camera" icon="styles/standard/vehicle/restriction/speed_camera.svg" type="node" preset_name_label="true">
    13591369            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
    13601370                  az.href="http://wiki.openstreetmap.org/wiki/Az:Tag:highway=speed_camera"
    … …  
    13841394            <text key="ref" text="Reference" />
    13851395        </item> <!-- Highway Milestone -->
    1386         <item name="Named Junction" name_context="junction=yes" type="node,closedway" preset_name_label="true">
     1396        <item name="Named Junction" name_context="junction=yes" icon="styles/standard/vehicle/junction.svg" type="node,closedway" preset_name_label="true">
    13871397            <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=yes"
    13881398                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:junction=yes" />
    … …  
    13921402        </item> <!-- Named Junction -->
    13931403        <separator/>
    1394         <item name="Elevator" icon="styles/standard/service/elevator.png" type="node,way,closedway" preset_name_label="true">
     1404        <item name="Elevator" icon="styles/standard/service/elevator.svg" type="node,way,closedway" preset_name_label="true">
    13951405            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=elevator"
    13961406                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=elevator"
    … …  
    14011411        </item> <!-- Elevator -->
    14021412        <separator/>
    1403         <item name="Grit Bin" icon="styles/standard/misc/grit_bin.png" type="node" preset_name_label="true">
     1413        <item name="Grit Bin" icon="styles/standard/misc/grit_bin.svg" type="node" preset_name_label="true">
    14041414            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grit_bin"
    14051415                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=grit_bin"
    … …  
    14091419        </item> <!-- Grit Bin -->
    14101420        <separator/>
    1411         <item name="Mountain Pass" icon="presets/mountain_pass.png" type="node" preset_name_label="true">
     1421        <item name="Mountain Pass" icon="styles/standard/misc/landmark/mountain_pass.svg" type="node" preset_name_label="true">
    14121422            <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass"
    14131423                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:mountain_pass"
    … …  
    19261936        </item> <!-- Canal -->
    19271937        <separator/>
    1928         <item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
     1938        <item name="Spring" icon="styles/standard/misc/landmark/spring.svg" type="node,closedway" preset_name_label="true">
    19291939            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
    19301940                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=spring"
    … …  
    19411951            <check key="drinking_water" text="Drinking Water" />
    19421952        </item> <!-- Spring -->
    1943         <item name="Waterfall" icon="presets/waterfall.png" type="node,way" preset_name_label="true">
     1953        <item name="Waterfall" icon="styles/standard/nautical/waterfall.svg" type="node,way" preset_name_label="true">
    19441954            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=waterfall"
    19451955                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=waterfall"
    … …  
    19511961            <reference ref="name_wikipedia" />
    19521962        </item> <!-- Waterfall -->
    1953         <item name="Weir" icon="presets/weir.png" type="node,way" preset_name_label="true">
     1963        <item name="Weir" icon="styles/standard/nautical/weir.svg" type="node,way" preset_name_label="true">
    19541964            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir"
    19551965                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=weir"
    … …  
    19641974            <text key="name" text="Name" />
    19651975        </item> <!-- Weir -->
    1966         <item name="Dam" icon="presets/dam.png" type="node,way,closedway" preset_name_label="true">
     1976        <item name="Dam" icon="styles/standard/nautical/dam.svg" type="node,way,closedway" preset_name_label="true">
    19671977            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam"
    19681978                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=dam"
    … …  
    20492059        </item> <!-- Covered Reservoir -->
    20502060        <separator/>
    2051         <item name="Water" name_context="natural" icon="presets/water.png" type="closedway,relation" preset_name_label="true">
     2061        <item name="Water" name_context="natural" icon="styles/standard/nautical/water.svg" type="closedway,relation" preset_name_label="true">
    20522062            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water"
    20532063                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=water"

  • trunk/data/validator/deprecated.mapcss

    r9435 r9506  
    342342
    343343/* see #10661, #10837, #11737 */
     344*[traffic_calming=yes],
    344345*[access=restricted],
    345346*[barrier=yes],

  • trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java

    r8870 r9506  
    151151            addDefault(def, "multiple",     tr("Multiple values"),     tr("Checks for wrong multiple values"));
    152152            addDefault(def, "numeric",      tr("Numeric values"),      tr("Checks for wrong numeric values"));
    153             addDefault(def, "power",        tr("Power"),               tr("Checks for errors on power infrastructures"));
    154153            addDefault(def, "religion",     tr("Religion"),            tr("Checks for errors on religious objects"));
    155154            addDefault(def, "relation",     tr("Relations"),           tr("Checks for errors on relations"));

  • trunk/styles/standard/elemstyles.mapcss

    r9500 r9506  
    669669}
    670670node[junction=yes] {
    671     icon-image: "misc/no_icon.png";
     671    icon-image: "vehicle/junction.svg";
    672672    set icon_z17;
    673673    text: auto;
    … …  
    698698}
    699699node[highway=stop] {
    700     icon-image: "vehicle/restriction/stop.png";
     700    icon-image: "vehicle/restriction/stop.svg";
    701701    set icon_z17;
    702702    text: auto;
    703703}
    704704node[highway=give_way] {
    705     icon-image: "vehicle/restriction/right_of_way.png";
     705    icon-image: "vehicle/restriction/give_way.svg";
    706706    set icon_z17;
    707707    text: auto;
    … …  
    738738}
    739739node[highway=speed_camera] {
    740     icon-image: "vehicle/restriction/speed_trap.png";
     740    icon-image: "vehicle/restriction/speed_camera.svg";
    741741    set icon_z17;
    742742    text: auto;
    … …  
    748748}
    749749node[traffic_sign=city_limit] {
    750     icon-image: "vehicle/restriction/citylimit.png";
     750    icon-image: "vehicle/restriction/city_limit.svg";
    751751    set icon_z17;
    752752    text: auto;
    … …  
    791791}
    792792node[highway=services] {
    793     icon-image: "vehicle/services.png";
     793    icon-image: "vehicle/services.svg";
    794794    set icon_z17;
    795795    text: auto;
    … …  
    799799}
    800800node[highway=rest_area] {
    801     icon-image: "vehicle/parking.png";
     801    icon-image: "vehicle/rest_area.svg";
    802802    set icon_z17;
    803803    text: auto;
    … …  
    822822}
    823823node[highway=turning_circle] {
    824     icon-image: "vehicle/turning_circle.png";
     824    icon-image: "vehicle/turning_circle.svg";
    825825    set icon_z17;
    826826    text: auto;
    827827}
    828828node[highway=turning_loop] {
    829     icon-image: "vehicle/turning_loop.png";
     829    icon-image: "vehicle/turning_loop.svg";
    830830    set icon_z17;
    831831    text: auto;
    832832}
    833833node[highway=passing_place] {
    834     icon-image: "vehicle/passing_place.png";
     834    icon-image: "vehicle/passing_place.svg";
    835835    set icon_z17;
    836836    text: auto;
    … …  
    840840}
    841841node[highway=elevator] {
    842     icon-image: "service/elevator.png";
     842    icon-image: "service/elevator.svg";
    843843    set icon_z17;
    844844    text: auto;
    … …  
    891891
    892892node[traffic_calming] {
    893     icon-image: "vehicle/traffic_calming_blue.png";
     893    icon-image: "vehicle/traffic_calming.svg";
    894894    set icon_z17;
    895895    text: auto;
    … …  
    901901}
    902902node[traffic_calming=choker] {
    903     icon-image: "vehicle/chocker.svg";
     903    icon-image: "vehicle/choker.svg";
    904904    set icon_z17;
    905905    text: auto;
    … …  
    910910    text: auto;
    911911}
    912 
     912node[traffic_calming=bump] {
     913    icon-image: "vehicle/bump.svg";
     914    set icon_z17;
     915    text: auto;
     916}
     917node[traffic_calming=hump] {
     918    icon-image: "vehicle/hump.svg";
     919    set icon_z17;
     920    text: auto;
     921}
     922node[traffic_calming=table] {
     923    icon-image: "vehicle/table.svg";
     924    set icon_z17;
     925    text: auto;
     926}
     927node[traffic_calming=cushion] {
     928    icon-image: "vehicle/cushion.svg";
     929    set icon_z17;
     930    text: auto;
     931}
     932node[traffic_calming=rumble_strip] {
     933    icon-image: "vehicle/rumble_strip.svg";
     934    set icon_z17;
     935    text: auto;
     936}
    913937/****************/
    914938/* junction tag */
    … …  
    25412565}
    25422566node[amenity=grit_bin] {
    2543     icon-image: "misc/grit_bin.png";
     2567    icon-image: "misc/grit_bin.svg";
    25442568    set icon_z17;
    25452569    text: auto;
    … …  
    41664190}
    41674191node[natural=spring] {
    4168     icon-image: "misc/landmark/spring.png";
     4192    icon-image: "misc/landmark/spring.svg";
    41694193    set icon_z17;
    41704194    text: auto;
    … …  
    44174441}
    44184442node[waterway=weir] {
    4419     icon-image: "nautical/weir.png";
     4443    icon-image: "nautical/weir.svg";
    44204444    set icon_z17;
    44214445    text: auto;
    … …  
    44294453}
    44304454node[waterway=dam] {
    4431     icon-image: "nautical/dam.png";
     4455    icon-image: "nautical/dam.svg";
    44324456    set icon_z17;
    44334457    text: auto;
    … …  
    44394463}
    44404464node[waterway=waterfall] {
    4441     icon-image: "nautical/waterfall.png";
     4465    icon-image: "nautical/waterfall.svg";
    44424466    set icon_z17;
    44434467    text: auto;
    … …  
    44794503
    44804504node[mountain_pass?] {
    4481     icon-image: "misc/landmark/mountain_pass.png";
     4505    icon-image: "misc/landmark/mountain_pass.svg";
    44824506    set icon_z0;
    44834507    text: auto;
Note: See TracChangeset for help on using the changeset viewer.