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

Add rendering for man-made cranes #3501

Merged
merged 31 commits into from
Dec 14, 2018
Merged

Add rendering for man-made cranes #3501

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0f9646b
Merge pull request #1 from gravitystorm/master
jeisenbe Oct 17, 2018
11543b1
Added amenity=internet_cafe
jeisenbe Oct 19, 2018
8a201e3
added amenity=internet_cafe
jeisenbe Oct 19, 2018
5ec0f0c
added icon for amenity=internet_cafe from Tomasz-W
jeisenbe Oct 19, 2018
0e8bb15
Rename amenity=internet_cafe.svg to internet_cafe.svg
jeisenbe Oct 19, 2018
445e091
Merge pull request #2 from jeisenbe/master
jeisenbe Oct 19, 2018
5ab0c1a
Delete internet_cafe.svg
jeisenbe Oct 19, 2018
76d8b64
Add new internet_cafe.svg from Tomasz-W
jeisenbe Oct 19, 2018
57d1cca
Merge pull request #3 from jeisenbe/internet-cafe
jeisenbe Oct 19, 2018
f5eceeb
Update amenity-points.mss
jeisenbe Oct 20, 2018
e2b6e32
internet_cafe
Oct 20, 2018
e481bfe
readded
Oct 20, 2018
8f80832
Merge branch 'master' of https://github.com/jeisenbe/openstreetmap-carto
jeisenbe Oct 20, 2018
b5e3167
Delete .DS_Store
jeisenbe Oct 20, 2018
1b321a2
Removed .DS_Store files
jeisenbe Oct 20, 2018
e90d3ea
Merge branch 'master' of https://github.com/jeisenbe/openstreetmap-carto
jeisenbe Oct 20, 2018
33f9472
Merge branch 'master' of https://github.com/gravitystorm/openstreetma…
jeisenbe Oct 20, 2018
8166b3c
Merge remote-tracking branch 'upstream/master'
jeisenbe Oct 22, 2018
771bd7a
Merge remote-tracking branch 'upstream/master'
jeisenbe Nov 2, 2018
4bc0cf1
Merge branch 'master' of https://github.com/jeisenbe/openstreetmap-carto
jeisenbe Nov 8, 2018
c4b8d0c
Add man_made_crane rendering
jeisenbe Nov 8, 2018
8e048fe
Merge remote-tracking branch 'upstream/master' into crane
jeisenbe Nov 11, 2018
bbad22e
Add marker-transform for crane icon
jeisenbe Nov 11, 2018
c2e0af6
Add marker-transform for crane icon
jeisenbe Nov 11, 2018
8af5fa1
Reduce crane initial zoom to z14 for >100m
jeisenbe Nov 11, 2018
231af2f
Merge branch 'crane' of https://github.com/jeisenbe/openstreetmap-car…
jeisenbe Nov 11, 2018
1296b00
Reduce text-dy to 4 for cranes
jeisenbe Nov 11, 2018
88d8364
Revert marker-transform and text-dy change for cranes
jeisenbe Nov 13, 2018
21d068a
Remove crane rendering from z14
jeisenbe Nov 14, 2018
8f922ed
Render cranes at z16 if height >50 or at z17
jeisenbe Nov 21, 2018
7356649
Merge 'upstream/master' into crane
jeisenbe Dec 2, 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
39 changes: 28 additions & 11 deletions amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,19 @@
}
}

[feature = 'man_made_crane'] {
[zoom >= 14][height >= 100],
[zoom >= 15][height >= 50],
[zoom >= 16][height >= 30],
[zoom >= 17] {
marker-file: url('symbols/man_made/crane.svg');
marker-fill: @man-made-icon;
marker-placement: interior;
marker-clip: false;
marker-transform: 'translate(0,-6)';
}
}

[feature = 'man_made_telescope']["telescope:type" != 'optical']["telescope:type" != null] {
[zoom >= 13]["telescope:diameter" >= 60],
[zoom >= 14]["telescope:diameter" >= 30],
Expand All @@ -564,16 +577,16 @@
}
}

[feature = 'man_made_telescope']["telescope:type" = 'optical'],
[feature = 'man_made_telescope']["telescope:type" = null], {
[zoom >= 14]["telescope:diameter" >= 8],
[zoom >= 15]["telescope:diameter" >= 4],
[zoom >= 16]["telescope:diameter" >= 2],
[zoom >= 17] {
marker-file: url('symbols/man_made/telescope_dome.svg');
marker-fill: @man-made-icon;
marker-placement: interior;
marker-clip: false;
[feature = 'man_made_telescope']["telescope:type" = 'optical'],
[feature = 'man_made_telescope']["telescope:type" = null], {
[zoom >= 14]["telescope:diameter" >= 8],
[zoom >= 15]["telescope:diameter" >= 4],
[zoom >= 16]["telescope:diameter" >= 2],
[zoom >= 17] {
marker-file: url('symbols/man_made/telescope_dome.svg');
marker-fill: @man-made-icon;
marker-placement: interior;
marker-clip: false;
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This whole section (telescope indentation) does not belong here.

}

Expand Down Expand Up @@ -1914,6 +1927,7 @@
[feature = 'man_made_telescope'][zoom >= 17],
[feature = 'man_made_water_tower'][zoom >= 17],
[feature = 'man_made_chimney'][zoom >= 17],
[feature = 'man_made_crane'][zoom >= 17],
[feature = 'man_made_waste_water_plant'][zoom >= 17] {
text-name: "[name]";
text-size: @standard-font-size;
Expand All @@ -1925,6 +1939,9 @@
[feature = 'historic_wayside_cross'] {
text-dy: 6;
}
[feature = 'man_made_crane'] {
text-dy: 4;
}
[feature = 'historic_city_gate'],
[feature = 'man_made_mast'],
[feature = 'man_made_tower'],
Expand Down Expand Up @@ -3163,4 +3180,4 @@
trunk/marker-height: 6;
}
}
}
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

End of line mark was deleted here, please get it back.

18 changes: 9 additions & 9 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1464,7 +1464,7 @@ Layer:
'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort',
'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre', 'swimming_area')
THEN leisure ELSE NULL END,
'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo')
'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'crane', 'storage_tank', 'silo')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('spring') THEN "natural" ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
Expand Down Expand Up @@ -1531,7 +1531,7 @@ Layer:
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'fitness_centre',
'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating', 'bird_hide',
'amusement_arcade', 'sports_centre', 'swimming_area')
OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo')
OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'crane', 'storage_tank', 'silo')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR "natural" IN ('spring')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
Expand Down Expand Up @@ -1597,7 +1597,7 @@ Layer:
'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort',
'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre',
'swimming_area') THEN leisure ELSE NULL END,
'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo')
'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'crane', 'storage_tank', 'silo')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance') THEN "natural" ELSE NULL END,
'waterway_' || CASE WHEN "waterway" IN ('waterfall') THEN waterway ELSE NULL END,
Expand Down Expand Up @@ -1630,7 +1630,7 @@ Layer:
tags->'denomination' as denomination,
tags->'generator:source' as "generator:source",
CASE
WHEN (man_made IN ('mast', 'tower', 'chimney') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
WHEN (man_made IN ('mast', 'tower', 'chimney''chimney', 'crane') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR waterway IN ('waterfall') THEN
CASE
WHEN tags->'height' ~ '^\d{1,3}(\.\d+)?( m)?$' THEN (SUBSTRING(tags->'height', '^(\d{1,3}(\.\d+)?)( m)?$'))::NUMERIC
Expand Down Expand Up @@ -1685,7 +1685,7 @@ Layer:
'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre',
'swimming_area')
OR barrier IN ('toll_booth')
OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'cross', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo')
OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'cross', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'crane', 'storage_tank', 'silo')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance')
OR waterway IN ('waterfall')
Expand Down Expand Up @@ -2088,7 +2088,7 @@ Layer:
'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill',
'construction', 'military', 'plant_nursery', 'religious') THEN landuse ELSE NULL END,
'man_made_' || CASE WHEN (man_made IN ('lighthouse', 'windmill', 'mast', 'tower', 'water_tower', 'pier', 'breakwater', 'groyne', 'obelisk', 'works',
'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
'communications_tower', 'telescope', 'chimney', 'crane', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('wood', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring', 'scree', 'shingle', 'bare_rock', 'sand', 'heath',
'grassland', 'scrub', 'beach', 'shoal', 'reef', 'glacier', 'strait') THEN "natural" ELSE NULL END,
Expand Down Expand Up @@ -2153,7 +2153,7 @@ Layer:
OR leisure IS NOT NULL
OR landuse IS NOT NULL
OR (man_made IN ('lighthouse', 'windmill', 'mast', 'tower', 'water_tower', 'pier', 'breakwater', 'groyne', 'obelisk', 'works',
'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
'communications_tower', 'telescope', 'chimney', 'crane', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR "natural" IS NOT NULL
OR place IN ('island', 'islet')
Expand Down Expand Up @@ -2272,7 +2272,7 @@ Layer:
'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill',
'construction', 'military', 'plant_nursery') THEN landuse ELSE NULL END,
'man_made_' || CASE WHEN (man_made IN ('lighthouse', 'windmill', 'mast', 'tower', 'water_tower', 'obelisk', 'works', 'communications_tower',
'telescope', 'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
'telescope', 'chimney', 'crane', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('wood', 'peak', 'volcano', 'saddle', 'cave_entrance', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring',
'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier', 'tree', 'strait')
Expand Down Expand Up @@ -2340,7 +2340,7 @@ Layer:
'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland', 'greenhouse_horticulture',
'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction', 'military', 'plant_nursery')
OR (man_made IN ('lighthouse', 'windmill', 'mast', 'tower', 'water_tower', 'cross', 'obelisk', 'works', 'communications_tower',
'telescope', 'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
'telescope', 'chimney', 'crane', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR "natural" IS NOT NULL
OR waterway IN ('waterfall')
Expand Down
41 changes: 41 additions & 0 deletions symbols/man_made/crane.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.