Changeset 9423 in josm


Ignore:
Timestamp:
2016-01-12T20:49:36+01:00 (9 years ago)
Author:
Klumbumbus
Message:

see #12297 - add new power icons (by zermes), move old icons to nodist folder; see also [o31980]; fix cable_distribution_cabinet link

Location:
trunk
Files:
4 added
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r9420 r9423  
    61526152        </item>
    61536153    </group> <!-- Military -->
    6154     <group name="Power" icon="presets/power.png">
    6155         <item name="Power Plant" icon="icons/power_station.png" type="closedway,relation" preset_name_label="true">
     6154    <group name="Power" icon="styles/standard/power/power.svg">
     6155        <item name="Power Plant" icon="styles/standard/power/plant.svg" type="closedway,relation" preset_name_label="true">
    61566156            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant"
    61576157                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=plant"
     
    61776177            </optional>
    61786178        </item> <!-- Power Plant -->
    6179         <group name="Power Generator" icon="presets/power.png">
     6179        <group name="Power Generator" icon="styles/standard/power/generator.svg">
    61806180            <item name="Biofuel Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
    61816181                <key key="generator:source" value="biofuel" />
     
    63366336        </group> <!-- Power Generator -->
    63376337        <separator/>
    6338         <item name="Power Substation" icon="icons/power_substation.n.16.png" type="node,closedway" preset_name_label="true">
     6338        <item name="Power Substation" icon="styles/standard/power/substation.svg" type="node,closedway" preset_name_label="true">
    63396339            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"
    63406340                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
     
    63536353            </optional>
    63546354        </item> <!-- Power Substation -->
    6355         <item name="Power Transformer" icon="styles/standard/misc/landmark/power/transformer.png" type="node,closedway" preset_name_label="true">
     6355        <item name="Power Transformer" icon="styles/standard/power/transformer.svg" type="node,closedway" preset_name_label="true">
    63566356            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
    63576357                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=transformer"
     
    63696369            </optional>
    63706370        </item> <!-- Power Transformer -->
    6371         <item name="Power Switchgear" icon="presets/power.png" type="closedway" preset_name_label="true">
     6371        <item name="Power Switchgear" icon="styles/standard/power/switchgear.svg" type="closedway" preset_name_label="true">
    63726372            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch"
    63736373                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
     
    63856385            </optional>
    63866386        </item> <!-- Power Switchgear -->
    6387         <item name="Power Busbar" icon="presets/power.png" type="way" preset_name_label="true">
     6387        <item name="Power Busbar" icon="styles/standard/power/busbar.svg" type="way" preset_name_label="true">
    63886388            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=busbar"
    63896389                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
     
    63966396            <reference ref="power_line_extra" />
    63976397        </item> <!-- Power Busbar -->
    6398         <item name="Power Bay" icon="presets/power.png" type="way" preset_name_label="true">
     6398        <item name="Power Bay" icon="styles/standard/power/bay.svg" type="way" preset_name_label="true">
    63996399            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=bay"
    64006400                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
     
    64076407            <reference ref="power_line_extra" />
    64086408        </item> <!-- Power Bay -->
    6409         <item name="Power Switch" icon="presets/power.png" type="node" preset_name_label="true">
     6409        <item name="Power Switch" icon="styles/standard/power/switch.svg" type="node" preset_name_label="true">
    64106410            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch" />
    64116411            <space />
     
    64136413        </item> <!-- Power Switch -->
    64146414        <separator/>
    6415         <item name="Power Converter" icon="presets/power.png" type="node,closedway" preset_name_label="true">
     6415        <item name="Power Converter" icon="styles/standard/power/converter.svg" type="node,closedway" preset_name_label="true">
    64166416            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=converter"
    64176417                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
     
    64296429            </optional>
    64306430        </item> <!-- Power Converter -->
    6431         <item name="Power Compensator" icon="presets/power.png" type="node,closedway" preset_name_label="true">
     6431        <item name="Power Compensator" icon="styles/standard/power/compensator.svg" type="node,closedway" preset_name_label="true">
    64326432            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=compensator"
    64336433                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
     
    64456445        </item> <!-- Power Compensator -->
    64466446        <separator/>
    6447         <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node" preset_name_label="true">
    6448             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
    6449                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable"
    6450                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable" />
     6447        <item name="Cable Distribution Cabinet" icon="styles/standard/power/cable_distribution_cabinet.svg" type="node" preset_name_label="true">
     6448            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
     6449                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
     6450                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable_distribution_cabinet" />
    64516451            <space />
    64526452            <key key="power" value="cable_distribution_cabinet" />
     
    64556455        </item> <!-- Cable Distribution Cabinet -->
    64566456        <separator/>
    6457         <item name="Power Tower" icon="styles/standard/misc/landmark/power/tower_small.png" type="node" preset_name_label="true">
     6457        <item name="Power Tower" icon="styles/standard/power/tower.svg" type="node" preset_name_label="true">
    64586458            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
    64596459                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
     
    64826482            </optional>
    64836483        </item> <!-- Power Tower -->
    6484         <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node" preset_name_label="true">
     6484        <item name="Pole" icon="styles/standard/power/pole.svg" type="node" preset_name_label="true">
    64856485            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
    64866486                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
     
    65006500            <reference ref="ref_operator_branch" />
    65016501        </item> <!-- Pole -->
    6502         <item name="Pole with Transformer" icon="styles/standard/misc/landmark/power/pole.png" type="node" preset_name_label="true">
     6502        <item name="Pole with Transformer" icon="styles/standard/power/pole_transformer.svg" type="node" preset_name_label="true">
    65036503            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
    65046504                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
     
    65256525            </optional>
    65266526        </item> <!-- Pole with Transformer-->
    6527         <item name="Power Line" icon="presets/power.png" type="way" preset_name_label="true">
     6527        <item name="Power Line" icon="styles/standard/power/line.svg" type="way" preset_name_label="true">
    65286528            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
    65296529                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
     
    65456545            </optional>
    65466546        </item> <!-- Power Line -->
    6547         <item name="Power Cable" icon="presets/power.png" type="way" preset_name_label="true">
     6547        <item name="Power Cable" icon="styles/standard/power/cable.svg" type="way" preset_name_label="true">
    65486548            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
    65496549                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable"
  • trunk/styles/standard/elemstyles.mapcss

    r9420 r9423  
    11311131
    11321132node[power=tower] {
    1133     icon-image: "misc/landmark/power/tower_small.png";
     1133    icon-image: "power/tower.svg";
    11341134    set icon_z17;
    11351135    text: auto;
    11361136}
    11371137node[power=pole] {
    1138     icon-image: "misc/landmark/power/pole.png";
     1138    icon-image: "power/pole.svg";
     1139    set icon_z17;
     1140    text: auto;
     1141}
     1142node[power=pole][transformer=distribution] {
     1143    icon-image: "power/pole_transformer.svg";
    11391144    set icon_z17;
    11401145    text: auto;
     
    11671172    fill-color: power#eeeeee;
    11681173}
    1169 node[power=cable_distribution_cabinet],
     1174node[power=cable_distribution_cabinet] {
     1175    icon-image: "power/cable_distribution_cabinet.svg";
     1176    set icon_z17;
     1177    text: auto;
     1178}
    11701179node[power=generator] {
    1171     icon-image: "misc/landmark/power.png";
     1180    icon-image: "power/generator.svg";
    11721181    set icon_z17;
    11731182    text: auto;
    11741183}
    11751184node[power=substation] {
    1176     icon-image: "icons/power_substation.n.16.png";
     1185    icon-image: "power/substation.svg";
    11771186    set icon_z17;
    11781187    text: auto;
    11791188}
    11801189node[power=transformer] {
    1181     icon-image: "misc/landmark/power/transformer.png";
    1182     icon-width: 16;
    1183     set icon_z17;
    1184     text: auto;
    1185 }
     1190    icon-image: "power/transformer.svg";
     1191    set icon_z17;
     1192    text: auto;
     1193}
     1194
     1195node[power=switchgear] {
     1196    icon-image: "power/switchgear.svg";
     1197    set icon_z17;
     1198    text: auto;
     1199}
     1200node[power=switch] {
     1201    icon-image: "power/switch.svg";
     1202    set icon_z17;
     1203    text: auto;
     1204}
     1205node[power=converter] {
     1206    icon-image: "power/converter.svg";
     1207    set icon_z17;
     1208    text: auto;
     1209}
     1210node[power=compensator] {
     1211    icon-image: "power/compensator.svg";
     1212    set icon_z17;
     1213    text: auto;
     1214}
     1215
    11861216
    11871217/*************************/
Note: See TracChangeset for help on using the changeset viewer.