Changeset 7967 in josm


Ignore:
Timestamp:
2015-01-15T00:47:55+01:00 (5 years ago)
Author:
Klumbumbus
Message:

see #10835 - icon unification and geometry consistency for some power tags. add validator warnings

Location:
trunk
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7965 r7967  
    55335533        </item> <!-- Power Transformer -->
    55345534        <item name="Power Switchgear" icon="presets/power.png" type="closedway" preset_name_label="true">
    5535             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch"
     5535            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switchgear"
    55365536                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
    55375537                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
     
    56095609        <separator/>
    56105610        <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node" preset_name_label="true">
    5611             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
     5611            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
    56125612                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable"
    56135613                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable" />
     
    56185618        </item> <!-- Cable Distribution Cabinet -->
    56195619        <separator/>
    5620         <item name="Power Tower" icon="icons/power_tower_high2.n.16.png" type="node" preset_name_label="true">
     5620        <item name="Power Tower" icon="styles/standard/misc/landmark/power/tower_small.png" type="node" preset_name_label="true">
    56215621            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
    56225622                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
     
    56435643            </optional>
    56445644        </item> <!-- Power Tower -->
    5645         <item name="Pole" icon="icons/power_tower_low.n.16.png" type="node" preset_name_label="true">
     5645        <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node" preset_name_label="true">
    56465646            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
    56475647                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
     
    56585658            <reference ref="ref_operator_branch" />
    56595659        </item> <!-- Pole -->
    5660         <item name="Pole with Transformer" icon="icons/power_tower_low.n.16.png" type="node" preset_name_label="true">
     5660        <item name="Pole with Transformer" icon="styles/standard/misc/landmark/power/pole.png" type="node" preset_name_label="true">
    56615661            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
    56625662                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
  • trunk/data/validator/combinations.mapcss

    r7937 r7967  
    108108/* {0.tag} without {1.key} */
    109109*[aeroway=terminal][!building],
     110*[power=generator][!generator:source],
    110111*[amenity=place_of_worship][!religion] {
    111112  throwWarning: tr("{0} without {1}", "{0.tag}", "{1.key}");
  • trunk/data/validator/geometry.mapcss

    r7963 r7967  
    4949node[waterway=riverbank],
    5050node[man_made=bridge],
     51node[power=plant],
    5152node[source:outline] {
    5253  throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
     
    6263way[entrance],
    6364way[man_made=survey_point],
     65way[power=pole],
    6466way[natural=peak],
    6567way[natural=saddle],
  • trunk/styles/standard/elemstyles.mapcss

    r7964 r7967  
    10721072/**************/
    10731073
    1074 area[power=tower] {
    1075     fill-color: power#eeeeee;
    1076 }
    10771074node[power=tower] {
    10781075    icon-image: "misc/landmark/power/tower_small.png";
     
    10951092    dashes: 9,9;
    10961093}
     1094node[power=plant],
     1095node[power=sub_station],
    10971096node[power=line],
    10981097node[power=cable],
     
    11031102}
    11041103area[power=plant],
    1105 area[power=sub_station],
    11061104area[power=substation],
    11071105area[power=transformer],
     1106area[power=compensator],
     1107area[power=converter],
    11081108area[power=generator] {
    11091109    fill-color: power#eeeeee;
    11101110}
    1111 node[power=plant],
    1112 node[power=sub_station],
    1113 node[power=substation],
    11141111node[power=cable_distribution_cabinet],
    11151112node[power=generator] {
     
    11181115    text: auto;
    11191116}
     1117node[power=substation] {
     1118    icon-image: "icons/power_substation.n.16.png";
     1119    set icon_z17;
     1120    text: auto;
     1121}
    11201122node[power=transformer] {
    11211123    icon-image: "misc/landmark/power/transformer.png";
     1124    icon-width: 16;
    11221125    set icon_z17;
    11231126    text: auto;
Note: See TracChangeset for help on using the changeset viewer.