Ignore:
Timestamp:
2014-11-18T14:01:28+01:00 (4 years ago)
Author:
Klumbumbus
Message:

Icon unification. Use preset icons of generator:source=* also for mappaint (before there was always the icon for power=generator displayed). Drop support of power_source in mappaint.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/styles/standard/elemstyles.mapcss

    r7724 r7728  
    10531053area[power=sub_station],
    10541054area[power=substation],
    1055 area[power=transformer] {
     1055area[power=transformer],
     1056area[power=generator] {
    10561057    fill-color: power#eeeeee;
    10571058}
     
    10591060node[power=sub_station],
    10601061node[power=substation],
    1061 node[power=cable_distribution_cabinet] {
     1062node[power=cable_distribution_cabinet],
     1063node[power=generator] {
    10621064    icon-image: "misc/landmark/power.png";
    10631065    set icon_z17;
     
    10691071    text: auto;
    10701072}
    1071 /* power_source is deprecated by the wiki, but still in use */
    1072 /* generator:source replaces power_source */
    1073 area[power_source=wind], area[generator:source=wind],
    1074 area[power_source=hydro], area[generator:source=hydro],
    1075 area[power_source=fossil],
    1076 area[power_source=coal], area[generator:source=coal],
    1077 area[power_source=gas], area[generator:source=gas],
    1078 area[power_source=photovoltaic],
    1079 area[power_source=nuclear], area[generator:source=nuclear],
    1080 area[power=generator] {
     1073
     1074/*************************/
     1075/* generator:source tags */
     1076/*************************/
     1077
     1078area[generator:source=nuclear],
     1079area[generator:source=wind],
     1080area[generator:source=hydro],
     1081area[generator:source=tidal],
     1082area[generator:source=wave],
     1083area[generator:source=osmotic],
     1084area[generator:source=geothermal],
     1085area[generator:source=solar],
     1086area[generator:source=coal],
     1087area[generator:source=gas],
     1088area[generator:source=biomass],
     1089area[generator:source=biofuel],
     1090area[generator:source=biogas],
     1091area[generator:source=oil],
     1092area[generator:source=diesel],
     1093area[generator:source=gasoline],
     1094area[generator:source=waste] {
    10811095    fill-color: power#eeeeee;
    10821096}
    1083 node[power_source=wind], node[generator:source=wind] {
    1084     icon-image: "misc/landmark/power/wind.png";
    1085     set icon_z17;
    1086     text: auto;
    1087 }
    1088 node[power_source=hydro], node[generator:source=hydro] {
    1089     icon-image: "misc/landmark/power/hydro.png";
    1090     set icon_z17;
    1091     text: auto;
    1092 }
    1093 node[power_source=fossil],
    1094 node[power_source=coal], node[generator:source=coal],
    1095 node[power_source=gas], node[generator:source=gas] {
    1096     icon-image: "misc/landmark/power/fossil.png";
    1097     set icon_z17;
    1098     text: auto;
    1099 }
    1100 node[power_source=photovoltaic] {
    1101 /*    FIXME photovoltaic NOT fossil*/
    1102     icon-image: "misc/landmark/power/fossil.png";
    1103     set icon_z17;
    1104     text: auto;
    1105 }
    1106 node[power_source=nuclear], node[generator:source=nuclear] {
    1107     icon-image: "misc/landmark/power/nuclear.png";
    1108     set icon_z17;
    1109     text: auto;
    1110 }
    1111 node[power=generator] {
    1112     icon-image: "misc/landmark/power.png";
    1113     set icon_z17;
    1114     text: auto;
    1115 }
    1116 
     1097node[generator:source=nuclear] {
     1098    icon-image: "presets/power_source-nuclear.svg";
     1099    set icon_z17;
     1100    text: auto;
     1101}
     1102node[generator:source=wind] {
     1103    icon-image: "presets/power_source-wind.svg";
     1104    set icon_z17;
     1105    text: auto;
     1106}
     1107node[generator:source=hydro],
     1108node[generator:source=tidal],
     1109node[generator:source=wave],
     1110node[generator:source=osmotic],
     1111node[generator:source=geothermal] {
     1112    icon-image: "presets/power_source-water.svg";
     1113    set icon_z17;
     1114    text: auto;
     1115}
     1116node[generator:source=solar] {
     1117    icon-image: "presets/power_source-sun.svg";
     1118    set icon_z17;
     1119    text: auto;
     1120}
     1121node[generator:source=coal] {
     1122    icon-image: "presets/power_source-coal.svg";
     1123    set icon_z17;
     1124    text: auto;
     1125}
     1126node[generator:source=gas] {
     1127    icon-image: "presets/power_source-gas.svg";
     1128    set icon_z17;
     1129    text: auto;
     1130}
     1131node[generator:source=biomass],
     1132node[generator:source=biofuel],
     1133node[generator:source=biogas] {
     1134    icon-image: "presets/power_source-biofuel.svg";
     1135    set icon_z17;
     1136    text: auto;
     1137}
     1138node[generator:source=oil],
     1139node[generator:source=diesel],
     1140node[generator:source=gasoline] {
     1141    icon-image: "presets/power_source-oil.svg";
     1142    set icon_z17;
     1143    text: auto;
     1144}
     1145node[generator:source=waste] {
     1146    icon-image: "presets/power_source-waste.svg";
     1147    set icon_z17;
     1148    text: auto;
     1149}
     1150node[power_source] {
     1151    icon-image: "misc/deprecated.png";
     1152    set icon_z17;
     1153    text: auto;
     1154}
    11171155/*****************/
    11181156/* man_made tags */
Note: See TracChangeset for help on using the changeset viewer.