Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Render Wind Turbines names, Change icon to gray, Do not render before z19 if location is rooftop #3515

Merged
merged 6 commits into from
Nov 24, 2018
Merged

Render Wind Turbines names, Change icon to gray, Do not render before z19 if location is rooftop #3515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fbc1d92
Render wind turbines by location not rooftop
jeisenbe Nov 14, 2018
8021025
Change wind turbine icon to man-made-icon gray
jeisenbe Nov 14, 2018
ebcd1ac
Render name labels for wind turbines
jeisenbe Nov 14, 2018
dde5bb7
Change wind generator svg icon
jeisenbe Nov 19, 2018
e99743d
Deleted old power_wind icon
jeisenbe Nov 23, 2018
24c69b1
Changed permissions to 644 for generator_wind.svg
jeisenbe Nov 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1472,12 +1472,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;
}
}
Expand Down Expand Up @@ -1906,6 +1907,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],
Expand All @@ -1930,6 +1934,7 @@
[feature = 'historic_wayside_cross'] {
text-dy: 6;
}
[feature = 'power_generator'],
[feature = 'historic_city_gate'],
[feature = 'man_made_mast'],
[feature = 'man_made_tower'],
Expand Down Expand Up @@ -2822,7 +2827,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],
Expand Down
14 changes: 10 additions & 4 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1487,7 +1487,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,
Expand Down Expand Up @@ -1538,7 +1538,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:
Expand Down Expand Up @@ -1640,7 +1640,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,
Expand Down Expand Up @@ -1696,7 +1696,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:
Expand Down Expand Up @@ -2122,6 +2122,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,
Expand Down Expand Up @@ -2228,6 +2230,8 @@ Layer:
office,
recycling_type,
"telescope:type",
"generator:source",
location,
castle_type,
sport,
information,
Expand Down Expand Up @@ -2316,6 +2320,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,
Expand Down
38 changes: 38 additions & 0 deletions symbols/generator_wind.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 0 additions & 40 deletions symbols/power_wind.svg
View file
Open in desktop

This file was deleted.