[openstreetmap-carto] 01/04: Imported Upstream version 2.42.0
Bas Couwenberg
sebastic at debian.org
Wed Aug 3 20:13:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository openstreetmap-carto.
commit d097f14803f14bc7cac9e57d780809e37ad7ead9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Aug 3 21:59:25 2016 +0200
Imported Upstream version 2.42.0
---
README.md | 14 ++++++++++
RELEASES.md | 56 ++++++++++++++++++++++++++++++++++++++
amenity-points.mss | 34 +++++++++++++++++------
ferry-routes.mss | 3 +-
landcover.mss | 2 +-
placenames.mss | 7 +----
project.mml | 10 +++----
project.yaml | 34 ++++++++++++-----------
roads.mss | 10 ++-----
stations.mss | 16 ++++-------
symbols/artwork-14.svg | 38 ++++++++++++++++++++++++++
symbols/charging_station.16.svg | 38 ++++++++++++++++++++++++++
symbols/department_store.p.16.png | Bin 993 -> 0 bytes
symbols/department_store.p.16.svg | 36 ++++++++++++++++++++++++
14 files changed, 241 insertions(+), 57 deletions(-)
diff --git a/README.md b/README.md
index 6c9fda0..8b174cc 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,20 @@ that need some cartographic judgement.
[issues]: https://github.com/gravitystorm/openstreetmap-carto/issues
[cleverness]: https://github.com/openstreetmap/mapnik-stylesheets/blob/master/inc/settings.xml.inc.template#L16
+## Database schema change (v3.x)
+
+The v3.x series will include [osm2pgsql lua transforms](https://github.com/openstreetmap/osm2pgsql/blob/master/docs/lua.md)
+and a hstore column with all other tags, allowing use of more OpenStreetMap data.
+Work is being done in the [lua branch](https://github.com/gravitystorm/openstreetmap-carto/tree/lua)
+and issues have their own [tag](https://github.com/gravitystorm/openstreetmap-carto/issues?q=is%3Aopen+is%3Aissue+label%3Alua).
+
+Initial releases will not make use of the new features, maintaining compatibility
+with v2.x and v2.x releases will continue with backports, allowing the style to be
+rendered from either a new database or an old one.
+
+When sufficient time has passed for users to reload their databases, new features
+can be used and 2.x compatibility will not be maintained.
+
# Alternatives
There are many open-source stylesheets written for creating OpenStreetMap-based
diff --git a/RELEASES.md b/RELEASES.md
new file mode 100644
index 0000000..30d5fcd
--- /dev/null
+++ b/RELEASES.md
@@ -0,0 +1,56 @@
+# Release process
+
+Throughout this document, replace $OLD_VERSION with the previous release and $NEW_VERSION with the next one. Versions should start with a v, e.g. `v2.40.0`.
+
+# Deciding to release
+
+1. Update your local master branch
+2. Review the changes in git since the last release with a command like `git log --graph $OLD_VERSION...master` or online at https://github.com/gravitystorm/openstreetmap-carto/compare/$OLD_VERSION...master
+3. Review [pull requests](https://github.com/gravitystorm/openstreetmap-carto/pulls) for anything that should be merged before release
+
+Decide among the maintainers if a new release is due.
+
+# Tagging a release
+1. Check out master with git
+2. Tag a release with `git tag -a $NEW_VERSION -m "Tag $NEW_VERSION"`. *Optional: Add `-s` and GPG sign the tag.*
+3. Push the tag with `git push origin $NEW_VERSION`. If you use a different name for the gravitystorm/openstreetmap-carto remote, use it instead.
+4. If there are any long-running development branches (e.g. `lua`) check them out and merge the new release with `git merge $NEW_RELEASE`.
+
+# Notifications
+
+1. Notify OSMF tile server admins [with an issue on OpenStreetMap Chef](https://github.com/openstreetmap/chef/issues/new?title=New openstreetmap-carto release, $NEW_RELEASE&body=A new version of openstreetmap-carto, [$NEW_RELEASE]%28https://github.com/gravitystorm/openstreetmap-carto/releases/tag/$NEW_RELEASE%29, has been released.). Add any deployment-related changes like new shapefiles or font changes to the ticket.
+
+2. Write an email to dev at openstreetmap.org and talk at openstreetmap.org with the subject "OpenStreetMap Carto release $NEW_VERSION" and the body
+
+```
+Dear all,
+
+Today, $NEW_VERSION of the openstreetmap-carto stylesheet (the default
+stylesheet on openstreetmap.org) has been released.
+
+If the tile server admins have rolled out the new version, add
+
+ and rolled out to the openstreetmap.org servers. It might take a
+ couple of days before all tiles show the new rendering.
+
+Changes include
+*A list of changes*
+
+Thanks to all the contributors for this release.
+
+If there are new contributors, add
+
+ including <name>, <name>, [a] new contributor[s].
+
+If there has been a major PR merged, additional thanks can be added
+
+For a full list of commits, see
+https://github.com/gravitystorm/openstreetmap-carto/compare/$OLD_VERSION...$NEW_VERSION
+
+As always, we welcome any bug reports at
+https://github.com/gravitystorm/openstreetmap-carto/issues.
+```
+
+3. Post an [openstreetmap.org diary entry](http://www.openstreetmap.org/diary/new) with the text from the email. Add links and other markdown if needed.
+
+4. *Optional: Post on twitter with a link to the diary entry.*
\ No newline at end of file
diff --git a/amenity-points.mss b/amenity-points.mss
index c3e519d..d539acb 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -114,6 +114,13 @@
marker-clip: false;
}
+ [feature = 'tourism_artwork'][zoom >= 17] {
+ marker-file: url('symbols/artwork-14.svg');
+ marker-fill: @amenity-brown;
+ marker-placement: interior;
+ marker-clip: false;
+ }
+
[feature = 'tourism_camp_site'][zoom >= 16] {
marker-file: url('symbols/camping.16.svg');
marker-fill: @transportation-icon;
@@ -202,6 +209,13 @@
}
}
+ [feature = 'amenity_charging_station'][zoom >= 17] {
+ marker-file: url('symbols/charging_station.16.svg');
+ marker-fill: @transportation-icon;
+ marker-placement: interior;
+ marker-clip: false;
+ }
+
[feature = 'amenity_fuel'][zoom >= 17] {
marker-file: url('symbols/fuel.16.svg');
marker-fill: @transportation-icon;
@@ -635,13 +649,11 @@
marker-clip: false;
}
- [feature = 'shop_copyshop'] {
- [zoom >= 17] {
- marker-file: url('symbols/copyshop-14.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [feature = 'shop_copyshop'][zoom >= 17] {
+ marker-file: url('symbols/copyshop-14.svg');
+ marker-placement: interior;
+ marker-clip: false;
+ marker-fill: @shop-icon;
}
[feature = 'shop_cosmetics'],
@@ -655,8 +667,10 @@
}
[feature = 'shop_department_store'][zoom >= 16] {
- point-file: url('symbols/department_store.p.16.png');
- point-placement: interior;
+ marker-file: url('symbols/department_store.p.16.svg');
+ marker-placement: interior;
+ marker-clip: false;
+ marker-fill: @shop-icon;
}
[feature = 'shop_doityourself'],
@@ -1313,6 +1327,7 @@
text-placement: interior;
}
+ [feature = 'tourism_artwork'][zoom >= 17],
[feature = 'historic_memorial'][zoom >= 17],
[feature = 'man_made_obelisk'][zoom >= 16],
[feature = 'historic_monument'][zoom >= 16],
@@ -1738,6 +1753,7 @@
}
[feature = 'highway_bus_stop'],
+ [feature = 'amenity_charging_station'],
[feature = 'amenity_fuel'],
[feature = 'amenity_bus_station'] {
[zoom >= 17] {
diff --git a/ferry-routes.mss b/ferry-routes.mss
index be29bd7..68def29 100644
--- a/ferry-routes.mss
+++ b/ferry-routes.mss
@@ -24,8 +24,7 @@
text-placement: line;
text-fill: @ferry-route-text;
text-spacing: 1000;
- text-size: 8;
- [zoom >= 14] { text-size: 10; }
+ text-size: 10;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-dy: -8;
diff --git a/landcover.mss b/landcover.mss
index c2d00d8..dcc13c3 100644
--- a/landcover.mss
+++ b/landcover.mss
@@ -41,7 +41,7 @@
@parking: #f7efb7;
@place_of_worship: #cdccc9;
@place_of_worship_outline: #111;
- at playground: #ccfff1;
+ at playground: lighten(@park, 5%);
@power: darken(@industrial, 5%);
@power-line: darken(@industrial-line, 5%);
@rest_area: #efc8c8; // also services
diff --git a/placenames.mss b/placenames.mss
index dc02af3..50052ff 100644
--- a/placenames.mss
+++ b/placenames.mss
@@ -6,11 +6,7 @@
.country {
[admin_level = '2'][zoom >= 3][way_pixels > 1000][way_pixels < 360000] {
text-name: "[name]";
- text-size: 9;
-
- [zoom >= 3] {
- text-size: 10;
- }
+ text-size: 10;
[zoom >= 4] {
text-size: 11;
}
@@ -23,7 +19,6 @@
[zoom >= 10] {
text-size: 14;
}
-
text-fill: @country-labels;
text-face-name: @book-fonts;
text-halo-fill: rgba(255,255,255,0.6);
diff --git a/project.mml b/project.mml
index 5033b9f..fe00f2b 100644
--- a/project.mml
+++ b/project.mml
@@ -1397,7 +1397,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', \n 'hostel', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', ' [...]
+ "table": "(SELECT\n way,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', \n 'hostel', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1423,7 +1423,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel', \n 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', ' [...]
+ "table": "(SELECT\n way,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel', \n 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1711,7 +1711,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 'helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', \n 'theme_park', 'museum', 'zoo', 'information', 'picnic_site') THEN [...]
+ "table": "(SELECT\n way,\n way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 'helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', \n 'theme_park', 'museum', 'zoo', 'information', 'picnic_s [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1763,7 +1763,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n way_pixels,\n feature,\n access,\n CONCAT(\n name,\n CASE WHEN name IS NOT NULL AND elevation IS NOT NULL THEN E'\\n' ELSE NULL END,\n CASE WHEN elevation IS NOT NULL THEN CONCAT(REPLACE(ROUND(elevation)::TEXT, '-', U&'\\2212'), U&'\\00A0', 'm') ELSE NULL END\n ) AS name,\n CASE\n WHEN \"natural\" IN ('peak', 'volcano', 'saddle') THEN elevation\n ELSE NULL\n END AS score,\n operator,\n ref,\n [...]
+ "table": "(SELECT\n way,\n way_pixels,\n feature,\n access,\n CONCAT(\n name,\n CASE WHEN name IS NOT NULL AND elevation IS NOT NULL THEN E'\\n' ELSE NULL END,\n CASE WHEN elevation IS NOT NULL THEN CONCAT(REPLACE(ROUND(elevation)::TEXT, '-', U&'\\2212'), U&'\\00A0', 'm') ELSE NULL END\n ) AS name,\n CASE\n WHEN \"natural\" IN ('peak', 'volcano', 'saddle') THEN elevation\n ELSE NULL\n END AS score,\n operator,\n ref,\n [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1945,7 +1945,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n name,\n admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')\n AND name IS NOT NULL\n AND osm_id < 0\n ORDER BY admin_level::integer ASC, way_area DESC\n) AS admin_text",
+ "table": "(SELECT\n way,\n name,\n admin_level\n FROM planet_osm_polygon\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')\n AND name IS NOT NULL\n ORDER BY admin_level::integer ASC, way_area DESC\n) AS admin_text",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
diff --git a/project.yaml b/project.yaml
index 9f2a3ef..07464d9 100644
--- a/project.yaml
+++ b/project.yaml
@@ -1647,7 +1647,7 @@ Layer:
way,
COALESCE(
'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,
- 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house',
+ 'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house',
'hostel', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 'cafe',
'car_rental', 'car_wash', 'cinema', 'clinic', 'community_centre', 'fire_station', 'fountain',
@@ -1655,7 +1655,8 @@ Layer:
'bicycle_parking', 'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship',
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court',
'fast_food', 'telephone', 'emergency_phone', 'taxi', 'theatre', 'toilets', 'drinking_water',
- 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility') THEN amenity ELSE NULL END,
+ 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
+ 'charging_station') THEN amenity ELSE NULL END,
'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer',
'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist',
'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet',
@@ -1694,7 +1695,7 @@ Layer:
FROM planet_osm_polygon
-- The upcoming where clause is needed for performance only, as the CASE statements would end up doing the equivalent filtering
WHERE aeroway IN ('helipad', 'aerodrome')
- OR tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel',
+ OR tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel',
'hotel', 'motel', 'information', 'museum', 'viewpoint', 'picnic_site')
OR amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 'cafe',
'car_rental', 'car_wash', 'cinema', 'clinic', 'community_centre',
@@ -1703,7 +1704,7 @@ Layer:
'dentist', 'place_of_worship', 'police', 'post_box', 'post_office', 'pub', 'biergarten',
'recycling', 'restaurant', 'food_court', 'fast_food', 'telephone', 'emergency_phone', 'taxi',
'theatre', 'toilets', 'drinking_water', 'prison', 'hunting_stand', 'nightclub', 'veterinary',
- 'social_facility')
+ 'social_facility', 'charging_station')
OR shop IS NOT NULL -- skip checking a huge list and use a null check
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table')
OR man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill', 'obelisk')
@@ -1728,7 +1729,7 @@ Layer:
way,
COALESCE(
'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,
- 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel',
+ 'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel',
'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 'cafe',
'car_rental', 'car_wash', 'cinema', 'clinic', 'community_centre', 'fire_station', 'fountain',
@@ -1736,7 +1737,8 @@ Layer:
'bicycle_parking', 'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship',
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court',
'fast_food', 'telephone', 'emergency_phone', 'taxi', 'theatre', 'toilets', 'drinking_water',
- 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility') THEN amenity ELSE NULL END,
+ 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
+ 'charging_station') THEN amenity ELSE NULL END,
'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer', 'confectionery',
'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre',
'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio',
@@ -1784,7 +1786,7 @@ Layer:
FROM planet_osm_point
-- The upcoming where clause is needed for performance only, as the CASE statements would end up doing the equivalent filtering
WHERE aeroway IN ('helipad', 'aerodrome')
- OR tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel',
+ OR tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel',
'hotel', 'motel', 'information', 'museum', 'viewpoint', 'picnic_site')
OR amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 'cafe',
'car_rental', 'car_wash', 'cinema', 'clinic', 'community_centre',
@@ -1793,7 +1795,7 @@ Layer:
'dentist', 'place_of_worship', 'police', 'post_box', 'post_office', 'pub', 'biergarten',
'recycling', 'restaurant', 'food_court', 'fast_food', 'telephone', 'emergency_phone',
'taxi', 'theatre', 'toilets', 'drinking_water', 'prison', 'hunting_stand', 'nightclub',
- 'veterinary', 'social_facility')
+ 'veterinary', 'social_facility', 'charging_station')
OR shop IS NOT NULL -- skip checking a huge list and use a null check
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway',
'dog_park')
@@ -2046,7 +2048,7 @@ Layer:
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,
COALESCE(
'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 'helipad', 'aerodrome') THEN aeroway ELSE NULL END,
- 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site',
+ 'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site',
'theme_park', 'museum', 'zoo', 'information', 'picnic_site') THEN tourism ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library',
'theatre', 'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking',
@@ -2055,7 +2057,7 @@ Layer:
'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 'pharmacy', 'doctors', 'dentist',
'atm', 'bicycle_rental', 'car_rental', 'car_wash', 'post_box', 'post_office',
'recycling', 'telephone', 'emergency_phone', 'toilets', 'taxi', 'drinking_water', 'hunting_stand',
- 'nightclub', 'veterinary', 'social_facility') THEN amenity ELSE NULL END,
+ 'nightclub', 'veterinary', 'social_facility', 'charging_station') THEN amenity ELSE NULL END,
'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer', 'confectionery',
'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre',
'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio',
@@ -2104,7 +2106,7 @@ Layer:
FROM planet_osm_polygon
-- The upcoming where clause is needed for performance only, as the CASE statements would end up doing the equivalent filtering
WHERE (aeroway IN ('gate', 'apron', 'helipad', 'aerodrome')
- OR tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', 'theme_park',
+ OR tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', 'theme_park',
'museum', 'viewpoint', 'attraction', 'zoo', 'information', 'picnic_site')
OR amenity IS NOT NULL -- skip checking a huge list and use a null check
OR shop IS NOT NULL
@@ -2188,7 +2190,7 @@ Layer:
NULL AS way_pixels,
COALESCE(
'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 'helipad', 'aerodrome') THEN aeroway ELSE NULL END,
- 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site',
+ 'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site',
'theme_park', 'museum', 'zoo', 'information', 'picnic_site') THEN tourism ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre',
'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking', 'bicycle_parking',
@@ -2196,7 +2198,8 @@ Layer:
'embassy', 'fuel', 'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 'hospital',
'ice_cream', 'pharmacy', 'doctors', 'dentist', 'atm', 'bicycle_rental', 'car_rental',
'car_wash', 'post_box', 'post_office', 'recycling', 'telephone', 'emergency_phone', 'toilets', 'taxi',
- 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility') THEN amenity ELSE NULL END,
+ 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
+ 'charging_station') THEN amenity ELSE NULL END,
'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion',
'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser',
'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio', 'photography',
@@ -2258,7 +2261,7 @@ Layer:
FROM planet_osm_point
-- The upcoming where clause is needed for performance only, as the CASE statements would end up doing the equivalent filtering
WHERE (aeroway IN ('gate', 'apron', 'helipad', 'aerodrome')
- OR tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', 'theme_park',
+ OR tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', 'theme_park',
'museum', 'viewpoint', 'attraction', 'zoo', 'information', 'picnic_site')
OR amenity IS NOT NULL -- skip checking a huge list and use a null check
OR shop IS NOT NULL
@@ -2429,11 +2432,10 @@ Layer:
way,
name,
admin_level
- FROM planet_osm_roads
+ FROM planet_osm_polygon
WHERE boundary = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')
AND name IS NOT NULL
- AND osm_id < 0
ORDER BY admin_level::integer ASC, way_area DESC
) AS admin_text
properties:
diff --git a/roads.mss b/roads.mss
index a87336a..69debbc 100644
--- a/roads.mss
+++ b/roads.mss
@@ -2400,21 +2400,15 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[junction = 'yes'],
[highway = 'traffic_signals'] {
- [zoom >= 14] {
+ [zoom >= 15] {
text-name: "[name]";
- text-size: 8;
+ text-size: 10;
text-fill: black;
text-face-name: @book-fonts;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 30;
text-min-distance: 2;
- [zoom >= 14] {
- text-size: 9;
- }
- [zoom >= 15] {
- text-size: 10;
- }
[zoom >= 17] {
text-size: 11;
/* Offset name on traffic_signals on zoomlevels where they are displayed
diff --git a/stations.mss b/stations.mss
index f0d2c68..b48dee5 100644
--- a/stations.mss
+++ b/stations.mss
@@ -21,9 +21,9 @@
[zoom >= 14] {
text-name: "[name]";
text-face-name: @bold-fonts;
- text-size: 9;
+ text-size: 10;
text-fill: @station-text;
- text-dy: 8;
+ text-dy: 9;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 0;
@@ -50,9 +50,9 @@
[zoom >= 15] {
text-name: "[name]";
text-face-name: @bold-fonts;
- text-size: 9;
+ text-size: 10;
text-fill: @station-text;
- text-dy: 9;
+ text-dy: 10;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 0;
@@ -74,17 +74,13 @@
[zoom >= 14] {
text-name: "[name]";
text-face-name: @book-fonts;
- text-size: 8;
+ text-size: 10;
text-fill: @station-text;
- text-dy: 8;
+ text-dy: 10;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 0;
text-placement: interior;
- [zoom >= 15] {
- text-size: 10;
- text-dy: 10;
- }
}
}
diff --git a/symbols/artwork-14.svg b/symbols/artwork-14.svg
new file mode 100644
index 0000000..b1cec10
--- /dev/null
+++ b/symbols/artwork-14.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg2"
+ viewBox="0 0 14 14"
+ height="14"
+ width="14"
+ version="1.1">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <rect
+ style="visibility:hidden;fill:none;stroke:none"
+ id="canvas"
+ y="-2"
+ x="0"
+ height="16"
+ width="16" />
+ <path
+ id="monument"
+ d="M 7 -0.009765625 C 6.3372585 -0.009765625 5.8007812 0.50741207 5.8007812 1.1464844 C 5.8007812 1.7855567 6.3372585 2.3027344 7 2.3027344 C 7.6627417 2.3027344 8.1992187 1.7855567 8.1992188 1.1464844 C 8.1992188 0.50741207 7.6627417 -0.009765625 7 -0.009765625 z M 5.8007812 3 C 5.378914 3 5 3.374187 5 3.7792969 C 5 4.5590588 6.4003906 6.9105056 6.4003906 7.6777344 L 6.4003906 10.017578 L 7.5996094 10.017578 L 7.5996094 7.6777344 C 7.5996094 6.9256876 9 4.5590588 9 3.7792969 C 9 3. [...]
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/symbols/charging_station.16.svg b/symbols/charging_station.16.svg
new file mode 100644
index 0000000..7053fdb
--- /dev/null
+++ b/symbols/charging_station.16.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.1"
+ width="16"
+ height="16"
+ viewBox="0 0 16 16"
+ id="svg2">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <rect
+ width="14"
+ height="14"
+ x="1"
+ y="1"
+ id="canvas"
+ style="visibility:hidden;fill:none;stroke:none" />
+ <path
+ d="M 3,2 C 1.8344723,2 1,2.7955215 1,4 L 1,15 8,15 8,7.125 C 8,7.125 8.875,7 8.875,8 l 0,4 c 0,2 1.864698,2.125 2.125,2.125 0.275652,0 2.125,-0.124975 2.125,-2.125 l 0,-4 c 0,0 1.387558,0.017377 1.375,-2.96875 l -0.75,0 0,-2 C 13.75,2.4640917 13,2.4675079 13,3 l 0,2 -1,0 0,-2 C 12,2.4538157 11.25,2.4548128 11.25,3 l 0,2 -0.75,0 c 0.01252,2.9863904 1.375,3 1.375,3 l 0,4 c 0,0.874159 -0.767136,0.875 -0.875,0.875 -0.107864,0 -0.875,-0.04279 -0.875,-0.875 l 0,-4 C 10.125,6.7190916 9,5.8 [...]
+ id="charging-station"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/symbols/department_store.p.16.png b/symbols/department_store.p.16.png
deleted file mode 100644
index c42b9a2..0000000
Binary files a/symbols/department_store.p.16.png and /dev/null differ
diff --git a/symbols/department_store.p.16.svg b/symbols/department_store.p.16.svg
new file mode 100644
index 0000000..d1cbd47
--- /dev/null
+++ b/symbols/department_store.p.16.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.1"
+ id="svg2"
+ viewBox="0 0 12.131796 14"
+ height="3.9511111mm"
+ width="3.4238625mm">
+ <defs
+ id="defs4" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(-47.54492,-1002.3066)"
+ id="layer1">
+ <path
+ id="rect3477"
+ transform="translate(47.54492,1002.3066)"
+ d="M 6.0996094 0 C 5.4632694 0 4.8273554 0.16062188 4.2558594 0.48242188 C 3.1356934 1.1133219 2.4263235 2.2802344 2.3984375 3.5527344 L 0.53125 3.5527344 L 0.033203125 12.972656 L 0.033203125 14 L 12.097656 14 L 11.544922 3.5527344 L 9.8007812 3.5527344 C 9.7728812 2.2802344 9.0635344 1.1133219 7.9433594 0.48242188 C 7.3718644 0.16062187 6.7359504 0 6.0996094 0 z M 6.0996094 1.5273438 C 6.4782704 1.5273438 6.8572935 1.6223 7.1953125 1.8125 C 7.8477355 2.18 8.2462705 2.8365344 8.2 [...]
+ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+</svg>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git
More information about the Pkg-grass-devel
mailing list