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

Render amenity=internet_cafe #3463

Merged
merged 18 commits into from
Oct 21, 2018
Merged

Render amenity=internet_cafe #3463

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 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
639a278
Merge pull request #4 from jeisenbe/master
jeisenbe Oct 20, 2018
ea00407
Added back final empty line
jeisenbe Oct 20, 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
10 changes: 9 additions & 1 deletion amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_internet_cafe'][zoom >= 17] {
marker-file: url('symbols/amenity/internet_cafe.svg');
marker-fill: @amenity-brown;
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_bar'][zoom >= 17] {
marker-file: url('symbols/amenity/bar.svg');
Expand Down Expand Up @@ -1730,6 +1737,7 @@
[feature = 'amenity_vehicle_inspection'][zoom >= 17],
[feature = 'amenity_car_wash'][zoom >= 17],
[feature = 'amenity_drinking_water'][zoom >= 17],
[feature = 'amenity_internet_cafe'][zoom >= 17],
[feature = 'tourism_picnic_site'][zoom >= 17],
[feature = 'leisure_bowling_alley'][zoom >= 17],
[feature = 'leisure_beach_resort'][zoom >= 17],
Expand Down Expand Up @@ -3084,4 +3092,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.

It looks like you have accidentally removed new line at the end of file, this is technical detail, but please bring it back.

8 changes: 4 additions & 4 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ Layer:
'fuel', 'hospital', 'ice_cream', 'embassy', 'library', 'courthouse', 'townhall', 'parking',
'bicycle_parking', 'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship',
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court',
'fast_food', 'telephone', 'taxi', 'theatre', 'toilets', 'drinking_water',
'fast_food', 'telephone', 'taxi', 'theatre', 'toilets', 'drinking_water', 'internet_cafe',
'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'vehicle_inspection',
'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'waste_disposal', 'shower', 'bbq',
'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END,
Expand Down Expand Up @@ -1601,7 +1601,7 @@ Layer:
'fuel', 'hospital', 'ice_cream', 'embassy', 'library', 'courthouse', 'townhall', 'parking',
'bicycle_parking', 'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship',
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court',
'fast_food', 'telephone', 'taxi', 'theatre', 'toilets', 'drinking_water',
'fast_food', 'telephone', 'taxi', 'theatre', 'toilets', 'drinking_water', 'internet_cafe',
'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'vehicle_inspection',
'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq',
'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END,
Expand Down Expand Up @@ -2067,7 +2067,7 @@ Layer:
'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 'bus_station', 'prison', 'university',
'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 'pharmacy', 'doctors', 'dentist',
'atm', 'bicycle_rental', 'bureau_de_change', 'car_rental', 'car_wash', 'post_box', 'post_office',
'recycling', 'telephone', 'toilets', 'taxi', 'drinking_water', 'hunting_stand',
'recycling', 'telephone', 'toilets', 'taxi', 'drinking_water', 'hunting_stand', 'internet_cafe',
'nightclub', 'veterinary', 'social_facility', 'vehicle_inspection', 'charging_station', 'arts_centre',
'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school',
'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END,
Expand Down Expand Up @@ -2240,7 +2240,7 @@ Layer:
'motorcycle_parking', 'police', 'fire_station', 'fountain', 'place_of_worship', 'grave_yard', 'shelter', 'bank',
'embassy', 'fuel', 'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 'hospital',
'ice_cream', 'pharmacy', 'doctors', 'dentist', 'atm', 'bicycle_rental', 'bureau_de_change','car_rental',
'car_wash', 'post_box', 'post_office', 'recycling', 'telephone', 'toilets', 'taxi',
'car_wash', 'post_box', 'post_office', 'recycling', 'telephone', 'toilets', 'taxi', 'internet_cafe',
'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'vehicle_inspection',
'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq',
'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END,
Expand Down
39 changes: 39 additions & 0 deletions symbols/amenity/internet_cafe.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.