Initial pass at rendering golf=* features

.gitattributes

@@ -3,3 +3,4 @@
 
 # Declare files that will always have LF line endings on checkout.
 *.sh text eol=lf
+*.py text eol=lf

.travis.yml

@@ -17,7 +17,7 @@ addons:
     - postgresql-9.5-postgis-2.4
     - osm2pgsql
 env:
-  - CARTO=1.2.0 MAPNIK='3.0.0 3.0.12'
+  - CARTO=1.2.0 MAPNIK='3.0.0 3.0.12 3.0.22'
 install:
   - npm install carto@$CARTO
   - pip3 install --user colormath

CHANGELOG.md

@@ -1,4 +1,20 @@
-## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v5.2.0...master)
+## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v5.3.1...master)
+
+## [v5.3.1](https://github.com/gravitystorm/openstreetmap-carto/compare/v5.3.0...v5.3.1) - 2021-02-04
+### Changes
+- Natural Earth URL changed to directly point at the NACIS CDN (#4306)
+- Added an option to the external data loader to grant SELECT permissions on the tables (#4307)
+
+## [v5.3.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v5.2.0...v5.3.0) - 2021-01-28
+
+### Major Changes
+- External shapefiles for coastline and other data are now loaded into the database with a provided script. (#4092)
+- The recommended indexes are now required. Attempting to render without them will result in abysmal performance.
+
+### Changes
+- amenity=embassy is no longer rendered, and office=diplomatic with diplomatic=embassy or diplomatic=consulate is instead (#4168)
+- Mini-roundabouts are rendered like a turning circle (#4218)
+- There is a new partial index for waterways
 
 ## [v5.2.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v5.1.0...v5.2.0) - 2020-05-8
 

Dockerfile.db

@@ -1,3 +1,3 @@
-FROM mdillon/postgis:10
+FROM postgis/postgis:10-2.5-alpine
 
-ADD ./scripts/tune-postgis.sh /docker-entrypoint-initdb.d
+COPY ./scripts/tune-postgis.sh /docker-entrypoint-initdb.d/tune-postgis.sh

INSTALL.md

@@ -27,7 +27,7 @@ osm2pgsql -G --hstore --style openstreetmap-carto.style --tag-transform-script o
 You can find a more detailed guide to setting up a database and loading data with osm2pgsql at [switch2osm.org](https://switch2osm.org/manually-building-a-tile-server-16-04-2-lts/).
 
 ### Custom indexes
-Custom indexes are not required, but will speed up rendering, particularly for full planet databases, heavy load, or other production environments. They will not be as helpful with development using small extracts.
+Custom indexes are required for rendering performance and are essential on full planet databases.
 
 ```
 psql -d gis -f indexes.sql
@@ -42,7 +42,7 @@ To download them and import them into the database you can run the following scr
 scripts/get-external-data.py
 ```
 
-This script downloads necessary files, generates and populates the *data* directory with all needed shapefiles, including indexing them through *shapeindex*.
+The script downloads shapefiles, loads them into the database and sets up the tables for rendering. Additional script option documentation can be seen with `scripts/get-external-data.py --help`.
 
 ## Fonts
 The stylesheet uses Noto, an openly licensed font family from Google with support for multiple scripts. The stylesheet uses Noto's "Sans" style where available. If not available, this stylesheet uses another appropriate style of the Noto family. The "UI" version is used where available, with its vertical metrics which fit better with Latin text.

README.md

@@ -4,6 +4,8 @@
 
 These are the CartoCSS map stylesheets for the Standard map layer on [OpenStreetMap.org](https://www.openstreetmap.org).
 
+The general purpose, the cartographic design goals and guidelines for this style are outlined in [CARTOGRAPHY.md](CARTOGRAPHY.md).
+
 These stylesheets can be used in your own cartography projects, and are designed
 to be easily customised. They work with [Kosmtik](https://github.com/kosmtik/kosmtik)
  and also with the command-line [CartoCSS](https://github.com/mapbox/carto) processor.
@@ -69,7 +71,12 @@ The v4.x series includes [osm2pgsql lua transforms](https://github.com/openstree
 and a hstore column with all other tags, allowing use of more OpenStreetMap data. Users need
 to reload their databases, v3.x compatibility is not maintained.
 
-There are over [300 open requests][issues], some that have been open for years.
+## Database schema change (v5.x)
+
+The v5.x series updates Lua tag transforms, linestring and polygon decisions have changed.
+
+
+There are over [400 open requests][issues], some that have been open for years.
 These need reviewing and dividing into obvious fixes, or additional new features
 that need some cartographic judgement.
 

docker-compose.yml

@@ -22,6 +22,7 @@ services:
     ports:
       - "127.0.0.1:5432:5432"
     environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
       - PG_WORK_MEM
       - PG_MAINTENANCE_WORK_MEM
   import:

external-data.yml

@@ -62,7 +62,7 @@ sources:
 
   ne_110m_admin_0_boundary_lines_land:
     type: shp
-    url: http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip
+    url: https://naciscdn.org/naturalearth/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip
     file: ne_110m_admin_0_boundary_lines_land.shp
     ogropts: &ne_opts
       - "--config"

indexes.sql

@@ -1,5 +1,4 @@
--- These are optional but suggested indexes for rendering OpenStreetMap Carto
--- with a full planet database.
+-- These are indexes for rendering performance with OpenStreetMap Carto.
 -- This file is generated with scripts/indexes.py
 
 CREATE INDEX planet_osm_line_ferry
@@ -11,14 +10,20 @@ CREATE INDEX planet_osm_line_name
 CREATE INDEX planet_osm_line_river
   ON planet_osm_line USING GIST (way)
   WHERE waterway = 'river';
+CREATE INDEX planet_osm_line_waterway
+  ON planet_osm_line USING GIST (way)
+  WHERE waterway IN ('river', 'canal', 'stream', 'drain', 'ditch');
 CREATE INDEX planet_osm_point_place
   ON planet_osm_point USING GIST (way)
   WHERE place IS NOT NULL AND name IS NOT NULL;
+CREATE INDEX planet_osm_polygon_admin
+  ON planet_osm_polygon USING GIST (ST_PointOnSurface(way))
+  WHERE name IS NOT NULL AND boundary = 'administrative' AND admin_level IN ('0', '1', '2', '3', '4');
 CREATE INDEX planet_osm_polygon_military
   ON planet_osm_polygon USING GIST (way)
   WHERE (landuse = 'military' OR military = 'danger_area') AND building IS NULL;
 CREATE INDEX planet_osm_polygon_name
-  ON planet_osm_polygon USING GIST (way)
+  ON planet_osm_polygon USING GIST (ST_PointOnSurface(way))
   WHERE name IS NOT NULL;
 CREATE INDEX planet_osm_polygon_nobuilding
   ON planet_osm_polygon USING GIST (way)

indexes.yml

@@ -13,10 +13,16 @@ line:
     where: route = 'ferry' AND osm_id > 0
   river:
     where: waterway = 'river'
+  waterway:
+    where: waterway IN ('river', 'canal', 'stream', 'drain', 'ditch')
 polygon:
   # The polygon table is by far the largest, and generally the slowest
   name:
+    function: ST_PointOnSurface(way)
     where: name IS NOT NULL
+  admin:
+    function: ST_PointOnSurface(way)
+    where: name IS NOT NULL AND boundary = 'administrative' AND admin_level IN ('0', '1', '2', '3', '4')
   nobuilding:
     where: building IS NULL
   military: