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

add amenity=research_institute #4278

Closed
wants to merge 3 commits into from
Closed

add amenity=research_institute #4278

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0faa8af
add amenity=research_institute
LaoshuBaby Jan 6, 2021
74e97fa
Compress multi-amanity into 7 lines, maybe wrong
LaoshuBaby Jan 11, 2021
ecfda05
re-order univ. with inst. to make it like comment said
LaoshuBaby Jan 11, 2021
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
6 changes: 3 additions & 3 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Layer:
FROM (SELECT
way, COALESCE(name, '') AS name,
('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway END)) AS aeroway,
('amenity_' || (CASE WHEN amenity IN ('bicycle_parking', 'motorcycle_parking', 'university', 'college', 'school', 'taxi',
('amenity_' || (CASE WHEN amenity IN ('bicycle_parking', 'motorcycle_parking', 'university', 'research_institute', 'college', 'school', 'taxi',
'hospital', 'kindergarten', 'grave_yard', 'prison', 'place_of_worship', 'clinic', 'ferry_terminal',
'marketplace', 'community_centre', 'social_facility', 'arts_centre', 'parking_space', 'bus_station',
'fire_station', 'police')
Expand Down Expand Up @@ -119,7 +119,7 @@ Layer:
WHERE (landuse IS NOT NULL
OR leisure IS NOT NULL
OR aeroway IN ('apron', 'aerodrome')
OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'taxi', 'university', 'college', 'school', 'hospital', 'kindergarten',
OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'taxi', 'university', 'research_institute', 'college', 'school', 'hospital', 'kindergarten',
'grave_yard', 'place_of_worship', 'prison', 'clinic', 'ferry_terminal', 'marketplace', 'community_centre', 'social_facility',
'arts_centre', 'parking_space', 'bus_station', 'fire_station', 'police')
OR man_made IN ('works', 'wastewater_plant','water_works')
Expand Down Expand Up @@ -1482,7 +1482,7 @@ Layer:
'nightclub', 'nursing_home', 'pharmacy', 'place_of_worship', 'police', 'post_box',
'post_office', 'prison', 'pub', 'public_bath', 'public_bookcase', 'recycling', 'restaurant', 'school',
'shelter', 'shower', 'social_facility', 'taxi', 'telephone', 'theatre', 'toilets', 'townhall',
'university', 'vehicle_inspection', 'veterinary') THEN amenity END,
'university', 'research_institute', 'vehicle_inspection', 'veterinary') THEN amenity END,
'amenity_' || CASE WHEN amenity IN ('waste_disposal') AND way_area IS NOT NULL THEN amenity END, -- Waste disposal points are rendered in the low priority layer
'amenity_' || CASE WHEN amenity IN ('vending_machine') AND tags->'vending' IN ('excrement_bags', 'parking_tickets', 'public_transport_tickets') THEN amenity END,
'diplomatic_'|| CASE WHEN tags->'office' IN ('diplomatic') AND tags->'diplomatic' IN ('embassy', 'consulate') THEN tags->'diplomatic' ELSE NULL END,
Expand Down
4 changes: 4 additions & 0 deletions style/amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2173,6 +2173,7 @@
[feature = 'amenity_school'],
[feature = 'amenity_college'],
[feature = 'amenity_university'],
[feature = 'amenity_research_institute'],
[feature = 'landuse_religious'],
[feature = 'natural_heath'],
[feature = 'natural_scrub'],
Expand Down Expand Up @@ -2286,6 +2287,9 @@
[feature = 'amenity_college'],
[feature = 'amenity_university'] {
text-fill: darken(@societal_amenities, 80%);
}
[feature = 'amenity_research_institute'] {
Copy link
Contributor

Choose a reason for hiding this comment

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

You can merge this entry with the block of kindergarten, school, college and university.

Copy link
Author

Choose a reason for hiding this comment

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

Emmm……but kindergarten or school are separated, so I think institute should be like that?

Copy link
Contributor

Choose a reason for hiding this comment

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

Are they?
image

Copy link
Author

Choose a reason for hiding this comment

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

Yes
I‘m new in this repo.
I guess your expected code is like that？

      [feature = 'amenity_kindergarten'],
      [feature = 'amenity_school'],
      [feature = 'amenity_college'],
      [feature = 'amenity_university' || feature = 'amenity_research_institute'] {
        text-fill: darken(@societal_amenities, 80%);
      }

（I don't know whether those is Grammatical (T_T)）

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess your expected code is like that？

No:

[feature = 'amenity_school'],
      [feature = 'amenity_college'],
      [feature = 'amenity_university'],
      [feature = 'amenity_research_institute'] {

Cartocss is based on CSS syntax.

Copy link
Author

Choose a reason for hiding this comment

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

Edited.Thanks @HolgerJeromin

text-fill: darken(@societal_amenities, 80%);
}
[feature = 'landuse_religious'] {
text-fill: darken(@place_of_worship, 50%);
Expand Down
1 change: 1 addition & 0 deletions style/landcover.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,7 @@
[feature = 'amenity_hospital'],
[feature = 'amenity_clinic'],
[feature = 'amenity_university'],
[feature = 'amenity_research_institute'],
[feature = 'amenity_college'],
[feature = 'amenity_school'],
[feature = 'amenity_kindergarten'],
Expand Down