diff --git a/amenity-points.mss b/amenity-points.mss
index 2a67263a86..eac014117f 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1479,12 +1479,13 @@
marker-clip: false;
}
- [feature = 'power_generator']['generator:source' = 'wind'],
- [feature = 'power_generator'][power_source = 'wind'] {
- [zoom >= 15] {
- marker-file: url('symbols/power_wind.svg');
+ [feature = 'power_generator']['generator:source' = 'wind'] {
+ [zoom >= 15][location != 'rooftop'][location != 'roof'],
+ [zoom >= 15][location = null],
+ [zoom >= 19] {
+ marker-file: url('symbols/generator_wind.svg');
marker-placement: interior;
- marker-fill: black;
+ marker-fill: @man-made-icon;
marker-clip: false;
}
}
@@ -1915,6 +1916,9 @@
}
[feature = 'man_made_cross'][zoom >= 17],
+ [feature = 'power_generator'][location != 'rooftop'][location != 'roof'][zoom >= 17],
+ [feature = 'power_generator'][location = null][zoom >= 17],
+ [feature = 'power_generator'][zoom >= 19],
[feature = 'historic_wayside_cross'][zoom >= 17],
[feature = 'historic_wayside_shrine'][zoom >= 17],
[feature = 'historic_city_gate'][zoom >= 17],
@@ -1939,6 +1943,7 @@
[feature = 'historic_wayside_cross'] {
text-dy: 6;
}
+ [feature = 'power_generator'],
[feature = 'historic_city_gate'],
[feature = 'man_made_mast'],
[feature = 'man_made_tower'],
@@ -2831,7 +2836,7 @@
[feature = 'power_plant'][is_building = 'no'][zoom >= 10],
[feature = 'power_station'][is_building = 'no'][zoom >= 10],
- [feature = 'power_generator'][is_building = 'no'][zoom >= 10],
+ [feature = 'power_generator'][is_building = 'no']["generator:source" != 'wind'][zoom >= 10],
[feature = 'power_sub_station'][is_building = 'no'][zoom >= 13],
[feature = 'power_substation'][is_building = 'no'][zoom >= 13]{
[way_pixels > 3000],
diff --git a/project.mml b/project.mml
index 9d0e354706..de45d57eac 100644
--- a/project.mml
+++ b/project.mml
@@ -1488,7 +1488,7 @@ Layer:
END
ELSE NULL
END AS height,
- tags->'power_source' as power_source,
+ tags->'location' as location,
tags->'icao' as icao,
tags->'iata' as iata,
tags->'office' as office,
@@ -1539,7 +1539,7 @@ Layer:
OR historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
OR military IN ('bunker')
OR highway IN ('bus_stop', 'elevator', 'traffic_signals')
- OR (power = 'generator' AND (tags @> '"generator:source"=>wind' OR tags @> 'power_source=>wind'))
+ OR (power = 'generator' AND tags @> '"generator:source"=>wind')
ORDER BY way_area desc
) AS amenity_points_poly
properties:
@@ -1641,7 +1641,7 @@ Layer:
END
ELSE NULL
END AS height,
- tags->'power_source' as power_source,
+ tags->'location' as location,
tags->'icao' as icao,
tags->'iata' as iata,
tags->'office' as office,
@@ -1697,7 +1697,7 @@ Layer:
OR tags @> 'emergency=>phone'
OR highway IN ('bus_stop', 'elevator', 'traffic_signals')
OR tags @> 'ford=>yes' OR tags @> 'ford=>stepping_stones'
- OR (power = 'generator' AND (tags @> '"generator:source"=>wind' OR tags @> 'power_source=>wind'))
+ OR (power = 'generator' AND tags @> '"generator:source"=>wind')
ORDER BY score DESC NULLS LAST
) AS amenity_points
properties:
@@ -2123,6 +2123,8 @@ Layer:
ELSE NULL
END AS height,
tags->'operator' as operator,
+ tags->'generator:source' as "generator:source",
+ tags->'location' as location,
tags->'icao' as icao,
tags->'iata' as iata,
tags->'office' as office,
@@ -2229,6 +2231,8 @@ Layer:
office,
recycling_type,
"telescope:type",
+ "generator:source",
+ location,
castle_type,
sport,
information,
@@ -2317,6 +2321,8 @@ Layer:
"natural",
waterway,
tags->'operator' as operator,
+ tags->'location' as location,
+ tags->'generator:source' as "generator:source",
tags->'icao' as icao,
tags->'iata' as iata,
tags->'office' as office,
diff --git a/symbols/generator_wind.svg b/symbols/generator_wind.svg
new file mode 100644
index 0000000000..d08094dfad
--- /dev/null
+++ b/symbols/generator_wind.svg
@@ -0,0 +1,38 @@
+
+
diff --git a/symbols/power_wind.svg b/symbols/power_wind.svg
deleted file mode 100644
index bb10f689a8..0000000000
--- a/symbols/power_wind.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-