Permalink
Browse files

Merge tag 'v4.6.0'

Tag v4.6.0
  • Loading branch information...
Sven Geggus
Sven Geggus committed Dec 19, 2017
2 parents aa877ef + ac7d4fb commit 64a5d0fa38fd5f18f48e513eecb44be97ac04b5b
Showing with 193 additions and 183 deletions.
  1. +1 −1 .travis.yml
  2. +16 −0 CHANGELOG.md
  3. +1 −1 INSTALL.md
  4. +1 −1 README.md
  5. +8 −4 RELEASES.md
  6. +1 −3 USECASES.md
  7. +1 −1 admin.mss
  8. +2 −2 amenity-points.mss
  9. +1 −1 ferry-routes.mss
  10. +14 −12 landcover.mss
  11. +12 −23 project.mml
  12. +117 −112 roads.mss
  13. +0 −1 scripts/get-shapefiles.py
  14. +2 −8 shapefiles.mss
  15. +16 −13 water.mss
View
@@ -13,7 +13,7 @@ env:
install:
- npm install carto@$CARTO
- mkdir -p data/world_boundaries data/simplified-land-polygons-complete-3857 data/ne_110m_admin_0_boundary_lines_land data/land-polygons-split-3857
- touch data/world_boundaries/builtup_area.shp data/simplified-land-polygons-complete-3857/simplified_land_polygons.shp data/ne_110m_admin_0_boundary_lines_land/ne_110m_admin_0_boundary_lines_land.shp data/land-polygons-split-3857/land_polygons.shp
- touch data/simplified-land-polygons-complete-3857/simplified_land_polygons.shp data/ne_110m_admin_0_boundary_lines_land/ne_110m_admin_0_boundary_lines_land.shp data/land-polygons-split-3857/land_polygons.shp
script:
# We're using pipes in the checks, so fail if any part fails
- set -o pipefail
View
@@ -2,6 +2,22 @@
openstreetmap-carto-de does not maintain a changelog. Instead have a log at the
git history. openstreetmap-carto-de commit messages are usually prefixed by "GERMAN STYLE:"
## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.6.0...master)
## [v4.6.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.5.0...v4.6.0) - 2017-12-17
### Changes
- Change sports_centre and stadium color to light green
- Change shades of green for landuse/leisure=recreation_ground and garden
- Do not render glaciers and icesheets on z6 and z7
- Do not render very small water areas on low zoom
- Do not render small national parks and nature reserves
- Do not render ferries on z7
- Improve rendering for bus guideways
- For built-up areas, replace the external data on z8 and z9 by OSM data
- Do not render bicycle/motorbike parking icons to z17
- Render community_centre and social_facility areas in light yellow
## [v4.5.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.4.0...v4.5.0) - 2017-11-17
### Major changes
- Cleaning up low zoom levels (z5-z7):
View
@@ -41,7 +41,7 @@ This script generates and populates the *data* directory with all needed shapefi
You can also download them manually at the following paths:
* [`world_bnd_m.shp`, `builtup_area.shp`, `places.shp`, `world_boundaries_m.shp`](http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz)
* [`world_bnd_m.shp`, `places.shp`, `world_boundaries_m.shp`](http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz)
* [`simplified_land_polygons.shp`](http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip) (updated daily)
* [`ne_110m_admin_0_boundary_lines_land.shp`](http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip)
* [`land_polygons.shp`](http://data.openstreetmapdata.com/land-polygons-split-3857.zip) (updated daily)
View
@@ -108,7 +108,7 @@ maps using Mapnik, many based on this project. Some alternatives are:
# Maintainers
* Andy Allan [@gravitystorm](https://github.com/gravitystorm/)
* Matthijs Melissen [@math1985](https://github.com/math1985/)
* Matthijs Melissen [@matthijsmelissen](https://github.com/matthijsmelissen/)
* Paul Norman [@pnorman](https://github.com/pnorman/)
* Mateusz Konieczny [@matkoniecz](https://github.com/matkoniecz/)
* Daniel Koć [@kocio-pl](https://github.com/kocio-pl)
View
@@ -28,12 +28,16 @@ Decide among the maintainers if a new release is due.
Dear all,
Today, $NEW_VERSION of the openstreetmap-carto stylesheet (the default
stylesheet on openstreetmap.org) has been released.
stylesheet on the OSM website) has been released. Once changes are deployed
on the openstreetmap.org it will take couple of days before all tiles
show the new rendering.
If the tile server admins have rolled out the new version, add
If the tile server admins have rolled out the new version, change it to:
and rolled out to the openstreetmap.org servers. It might take a
couple of days before all tiles show the new rendering.
Today, $NEW_VERSION of the openstreetmap-carto stylesheet (the default
stylesheet on the OSM website) has been released 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*
View
@@ -7,7 +7,7 @@ As we are still experimenting with this way of design, this document is restrict
| Use case | Map subject | Map context | Zoom level |
| --- | --- | --- | --- |
| Looking up country location | Country names, country borders | Coastlines | z5, z6 |
| Looking up U.S. state location | state names and borders in USA | Coastlines, country bnorders | z5, z6, z7 |
| Looking up U.S. state location | state names and borders in USA | Coastlines, country borders | z5, z6, z7 |
| Looking up province/state location|Province/state names and borders|Country borders | z6, z7 |
| Looking up city location | City names | Coastlines, country names, country borders | z5, z6, z7 |
| Long distance road trip planning | Motorways | City names | z6, z7 |
@@ -23,7 +23,5 @@ Some features that we currently render for which we do not (yet) have a use case
* Province/state names and borders (except USA) on z5
* Minor water areas on z5/6/7
* Glaciers and icesheets on z6 and z7
* Military areas on z7
* Ferry routes on z7
* Island names on z5/6/7
View
@@ -190,7 +190,7 @@ overlapping borders correctly.
}
#nature-reserve-boundaries {
[way_pixels > 100][zoom >= 8] {
[way_pixels > 3000][zoom >= 8] {
[zoom < 10] {
::fill {
opacity: 0.05;
View
@@ -1057,8 +1057,8 @@
}
[feature = 'amenity_parking'][zoom >= 17],
[feature = 'amenity_bicycle_parking'][zoom >= 17],
[feature = 'amenity_motorcycle_parking'][zoom >= 17] {
[feature = 'amenity_bicycle_parking'][zoom >= 18],
[feature = 'amenity_motorcycle_parking'][zoom >= 18] {
[feature = 'amenity_parking'] {
marker-file: url('symbols/parking.svg');
}
View
@@ -2,7 +2,7 @@
@ferry-route-text: @ferry-route;
#ferry-routes {
[zoom >= 7] {
[zoom >= 8] {
/* background prevents problems with overlapping ferry-routes, see #457 */
background/line-color: @water-color;
background/line-width: 1; /* Needs to be a bit wider than the route itself because of antialiasing */
View
@@ -1,10 +1,10 @@
// --- Parks, woods, other green things ---
@grass: #cdebb0; // also meadow, common, garden, village_green
@grass: #cdebb0; // also grassland, meadow, common, village_green
@scrub: #b5e3b5;
@forest: #add19e; // Lch(80,30,135)
@forest-text: #46673b; // Lch(40,30,135)
@park: #c8facc; // Lch(94,30,145) also recreation_ground
@park: #c8facc; // Lch(94,30,145) also garden
@orchard: #aedfa3; // also vineyard, plant_nursery
// --- "Base" landuses ---
@@ -61,7 +61,7 @@
@pitch: #aae0cb; // also track
@track: @pitch;
@stadium: @societal_amenities; // also sports_centre
@stadium: @leisure; // also sports_centre
@golf_course: #b5e3b5;
#landcover-low-zoom[zoom < 10],
@@ -97,6 +97,8 @@
[way_pixels >= 64] { polygon-gamma: 0.3; }
}
[feature = 'leisure_recreation_ground'][zoom >= 10],
[feature = 'landuse_recreation_ground'][zoom >= 10],
[feature = 'leisure_playground'][zoom >= 13],
[feature = 'leisure_fitness_station'][zoom >= 13] {
polygon-fill: @leisure;
@@ -214,7 +216,7 @@
line-opacity: 0.329;
}
[feature = 'landuse_residential'][zoom >= 10] {
[feature = 'landuse_residential'][zoom >= 8] {
polygon-fill: @built-up-lower-lowzoom;
[zoom >= 11] { polygon-fill: @built-up-upper-lowzoom; }
[zoom >= 13] { polygon-fill: @residential; }
@@ -251,7 +253,7 @@
}
[feature = 'leisure_park'],
[feature = 'leisure_recreation_ground'] {
[feature = 'leisure_garden'] {
[zoom >= 10] {
polygon-fill: @park;
[way_pixels >= 4] { polygon-gamma: 0.75; }
@@ -332,10 +334,8 @@
[feature = 'landuse_meadow'],
[feature = 'natural_grassland'],
[feature = 'landuse_grass'],
[feature = 'landuse_recreation_ground'],
[feature = 'landuse_village_green'],
[feature = 'leisure_common'],
[feature = 'leisure_garden'] {
[feature = 'leisure_common'] {
[zoom >= 10] {
polygon-fill: @grass;
[way_pixels >= 4] { polygon-gamma: 0.75; }
@@ -345,7 +345,7 @@
[feature = 'landuse_retail'],
[feature = 'amenity_marketplace'] {
[zoom >= 10] {
[zoom >= 8] {
polygon-fill: @built-up-lower-lowzoom;
[zoom >= 11] { polygon-fill: @built-up-upper-lowzoom; }
[zoom >= 13] { polygon-fill: @retail; }
@@ -361,7 +361,7 @@
}
}
[feature = 'landuse_industrial'][zoom >= 10] {
[feature = 'landuse_industrial'][zoom >= 8] {
polygon-fill: @built-up-lower-lowzoom;
[zoom >= 11] { polygon-fill: @built-up-upper-lowzoom; }
[zoom >= 13] { polygon-fill: @industrial; }
@@ -413,7 +413,7 @@
[way_pixels >= 64] { polygon-gamma: 0.3; }
}
[feature = 'landuse_commercial'][zoom >= 10] {
[feature = 'landuse_commercial'][zoom >= 8] {
polygon-fill: @built-up-lower-lowzoom;
[zoom >= 11] { polygon-fill: @built-up-upper-lowzoom; }
[zoom >= 13] { polygon-fill: @commercial; }
@@ -520,7 +520,9 @@
[feature = 'amenity_university'],
[feature = 'amenity_college'],
[feature = 'amenity_school'],
[feature = 'amenity_kindergarten'] {
[feature = 'amenity_kindergarten'],
[feature = 'amenity_community_centre'],
[feature = 'amenity_social_facility'] {
[zoom >= 10] {
polygon-fill: @residential;
[zoom >= 12] {
View
@@ -72,17 +72,6 @@ Layer:
type: shape
properties:
minzoom: 10
- id: builtup
geometry: polygon
extent: *world
srs-name: mercator
srs: "+proj=merc +datum=WGS84 +over"
Datasource:
file: data/world_boundaries/builtup_area.shp
type: shape
properties:
minzoom: 8
maxzoom: 9
- id: necountries
geometry: linestring
<<: *extents84
@@ -103,12 +92,12 @@ Layer:
COALESCE(wetland, landuse, "natural") AS feature
FROM (SELECT
way, localized_name_without_brackets AS name, religion,
('landuse_' || (CASE WHEN landuse IN ('forest', 'military', 'farmland') THEN landuse ELSE NULL END)) AS landuse,
('landuse_' || (CASE WHEN landuse IN ('forest', 'military', 'farmland', 'residential', 'commercial', 'retail', 'industrial') THEN landuse ELSE NULL END)) AS landuse,
('natural_' || (CASE WHEN "natural" IN ('wood', 'sand', 'scree', 'shingle', 'bare_rock') THEN "natural" ELSE NULL END)) AS "natural",
('wetland_' || (CASE WHEN "natural" IN ('wetland', 'mud') THEN (CASE WHEN "natural" IN ('mud') THEN "natural" ELSE tags->'wetland' END) ELSE NULL END)) AS wetland,
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
FROM planet_osm_polygon
WHERE (landuse IN ('forest', 'military', 'farmland')
WHERE (landuse IN ('forest', 'military', 'farmland', 'residential', 'commercial', 'retail', 'industrial')
OR "natural" IN ('wood', 'wetland', 'mud', 'sand', 'scree', 'shingle', 'bare_rock'))
AND way_area > 0.01*!pixel_width!::real*!pixel_height!::real
AND building IS NULL
@@ -131,7 +120,8 @@ Layer:
way, localized_name_without_brackets AS name,
('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway ELSE NULL END)) AS aeroway,
('amenity_' || (CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'university', 'college', 'school',
'hospital', 'kindergarten', 'grave_yard', 'prison', 'place_of_worship', 'clinic', 'ferry_terminal', 'marketplace')
'hospital', 'kindergarten', 'grave_yard', 'prison', 'place_of_worship', 'clinic', 'ferry_terminal',
'marketplace', 'community_centre', 'social_facility')
THEN amenity ELSE NULL END)) AS amenity,
('landuse_' || (CASE WHEN landuse IN ('quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass',
'allotments', 'forest', 'farmyard', 'farmland', 'greenhouse_horticulture',
@@ -155,7 +145,7 @@ Layer:
OR leisure IS NOT NULL
OR aeroway IN ('apron', 'aerodrome')
OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'university', 'college', 'school', 'hospital', 'kindergarten',
'grave_yard', 'place_of_worship', 'prison', 'clinic', 'ferry_terminal', 'marketplace')
'grave_yard', 'place_of_worship', 'prison', 'clinic', 'ferry_terminal', 'marketplace', 'community_centre', 'social_facility')
OR man_made IN ('works')
OR military IN ('danger_area')
OR "natural" IN ('beach', 'shoal', 'heath', 'mud', 'marsh', 'wetland', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub')
@@ -219,7 +209,7 @@ Layer:
file: data/antarctica-icesheet-polygons-3857/icesheet_polygons.shp
type: shape
properties:
minzoom: 4
minzoom: 8
- id: water-areas
geometry: polygon
<<: *extents
@@ -279,7 +269,7 @@ Layer:
file: data/antarctica-icesheet-outlines-3857/icesheet_outlines.shp
type: shape
properties:
minzoom: 4
minzoom: 8
- id: water-lines
class: water-lines
geometry: linestring
@@ -444,7 +434,7 @@ Layer:
properties:
minzoom: 13
- id: tunnels
class: tunnels-fill tunnels-casing access
class: access
geometry: linestring
<<: *extents
Datasource:
@@ -659,7 +649,7 @@ Layer:
WHERE route = 'ferry'
) AS ferry_routes
properties:
minzoom: 7
minzoom: 8
- id: turning-circle-casing
geometry: point
<<: *extents
@@ -708,7 +698,6 @@ Layer:
properties:
minzoom: 14
- id: roads-casing
class: roads-casing
geometry: linestring
<<: *extents
Datasource:
@@ -837,7 +826,7 @@ Layer:
properties:
minzoom: 14
- id: roads-fill
class: roads-fill access
class: access
geometry: linestring
<<: *extents
Datasource:
@@ -1035,7 +1024,7 @@ Layer:
properties:
minzoom: 12
- id: bridges
class: bridges-fill bridges-casing access
class: access
geometry: linestring
<<: *extents
Datasource:
@@ -1150,7 +1139,7 @@ Layer:
WHERE highway = 'bus_guideway'
) AS guideways
properties:
minzoom: 13
minzoom: 11
- id: aeroways
geometry: linestring
<<: *extents
Oops, something went wrong.

0 comments on commit 64a5d0f

Please sign in to comment.