Use flex backend

.github/workflows/ci.yml

@@ -59,12 +59,12 @@ jobs:
     - name: Wait for database
       run : sudo pg_ctlcluster 14 main start; until pg_isready; do sleep 0.5; done
     - name: Setup database
-      run: sudo -i -u postgres createuser -s $USER && createdb -E utf8 gis && psql -Xq -d gis -c "CREATE EXTENSION postgis; CREATE EXTENSION hstore;"
+      run: sudo -i -u postgres createuser -s $USER && createdb -E utf8 flex && psql -Xq -d flex -c "CREATE EXTENSION postgis; CREATE EXTENSION hstore;"
     - name: Import empty file
       run: |
-        osm2pgsql -G --hstore --style openstreetmap-carto.style --tag-transform-script openstreetmap-carto.lua -d gis -r xml <(echo '<osm version="0.6"/>')
+        osm2pgsql --output flex --style openstreetmap-carto.lua -d flex -r xml <(echo '<osm version="0.6"/>')
     - name: Create indexes
-      run: psql -1Xq -v ON_ERROR_STOP=1 -d gis -f indexes.sql
+      run: psql -1Xq -v ON_ERROR_STOP=1 -d flex -f indexes.sql
     - name: Load empty shapefiles
       run: scripts/get-external-data.py --no-update --cache -D scripts/empty_files
     - name: Test queries are valid

CONTRIBUTING.md

@@ -134,6 +134,13 @@ Because SQL within JSON or YAML will not generally be syntax highlighted, indent
 * Hstore queries tested for NULL should be enclosed in parentheses, e.g. `(tags->'foo') IS NULL`.
 * To check if a tag is in the tags hstore, use `tags @> 'foo=>bar'`, relying on automatic conversion from `text` to `hstore`.
 
+## Lua style guidelines
+
+* Four space indents, no tabs
+* No external dependencies
+* Use `a["name"]` where name is a tag key, and `a.name` otherwise.
+
+
 ## Map icon guidelines
 
 * All new icons must be SVG format only.  The SVG must be saved as standards compliant SVG without any proprietary tags. In Inkscape software, you will need to "Save As..." and choose the format Optimized SVG (preferable) or Plain SVG.

DOCKER.md

@@ -99,5 +99,5 @@ Docker stores its disk image by default in the home directories of the user. If
 When working with the style's database tables after an import, it can be helpful to log in at the [console](https://www.postgresql.org/docs/current/app-psql.html) to inspect the table structure or view imported data. The following command will open a psql console on the database:
 
 ```
-docker-compose exec -e PGUSER=postgres -e PGDATABASE=gis db psql
+docker-compose exec -e PGUSER=postgres -e PGDATABASE=flex db psql
 ```

INSTALL.md

@@ -3,25 +3,25 @@
 This document describes how to manually configure your system for running OpenStreetMap Carto. If you prefer quick, platform independent setup for a development environment, without the need to install and configure tools by hand, follow a Docker installation guide in [DOCKER.md](DOCKER.md).
 
 ## OpenStreetMap data
-You need OpenStreetMap data loaded into a PostGIS database (see below for [dependencies](#dependencies)). These stylesheets expect a database generated with osm2pgsql using the pgsql backend (table names of `planet_osm_point`, etc), the default database name (`gis`), and the [lua transforms](https://osm2pgsql.org/doc/manual.html#lua-tag-transformations) documented in the instructions below.
+You need OpenStreetMap data loaded into a PostGIS database (see below for [dependencies](#dependencies)). These stylesheets expect a database generated with osm2pgsql using the flex backend with the supplied Lua scripts. This requires osm2pgsql 1.4.1 or later.
 
 Start by creating a database
 
 ```sh
 sudo -u postgres createuser -s $USER
-createdb gis
+createdb flex
 ```
 
 Enable PostGIS and hstore extensions with
 
 ```sh
-psql -d gis -c 'CREATE EXTENSION postgis; CREATE EXTENSION hstore;'
+psql -d flex -c 'CREATE EXTENSION postgis; CREATE EXTENSION hstore;'
 ```
 
 then grab some OSM data. It's probably easiest to grab an PBF of OSM data from [Geofabrik](https://download.geofabrik.de/). Once you've done that, import with osm2pgsql:
 
 ```sh
-osm2pgsql -G --hstore --style openstreetmap-carto.style --tag-transform-script openstreetmap-carto.lua -d gis ~/path/to/data.osm.pbf
+osm2pgsql --output flex --style openstreetmap-carto.lua -d flex ~/path/to/data.osm.pbf
 ```
 
 You can find a more detailed guide to setting up a database and loading data with osm2pgsql at [switch2osm.org](https://switch2osm.org/serving-tiles/manually-building-a-tile-server-16-04-2-lts/).
@@ -32,19 +32,19 @@ We do not recommend [PostgreSQL JIT](https://www.postgresql.org/docs/current/jit
 
 Disabling JIT is **essential** for use with Kosmtik and other style development tools.
 
-JIT can be disabled with `psql -d gis -c 'ALTER SYSTEM SET jit=off;' -c 'SELECT pg_reload_conf();'` or any other means of adjusting the PostgreSQL config.
+JIT can be disabled with `psql -d postgres -c 'ALTER SYSTEM SET jit=off;' -c 'SELECT pg_reload_conf();'` or any other means of adjusting the PostgreSQL config.
 
 ### Custom indexes
 Custom indexes are required for rendering performance and are essential on full planet databases. These are generated by the `scripts/indexes.py` script, see `scripts/indexes.py --help` for various advanced options, but the command below will work to create the indexes on a new installation:
 
 ```sh
-psql -d gis -f indexes.sql
+psql -d flex -f indexes.sql
 ```
 
 The indexes can be created in parallel with
 
 ```sh
-scripts/indexes.py -0 | xargs -0 -P0 -I{} psql -d gis -c "{}"
+scripts/indexes.py -0 | xargs -0 -P0 -I{} psql -d flex -c "{}"
 ```
 
 ## Scripted download
@@ -81,9 +81,9 @@ For development, a style design studio is needed.
 To display any map a database containing OpenStreetMap data and some utilities are required
 
 * [PostgreSQL](https://www.postgresql.org/)
-* [PostGIS](https://postgis.net/)
-* [osm2pgsql](https://github.com/openstreetmap/osm2pgsql#installing) to [import your data](https://switch2osm.org/serving-tiles/updating-as-people-edit/) into a PostGIS database
-* Python 3 with the psycopg2, yaml, and requests libraries (`python3-psycopg2`, `python3-yaml`, `python3-requests` packages on Debian-derived systems)
+* [PostGIS](https://postgis.net/) 3.1.0 or later with GEOS 3.9.0 or later
+* [osm2pgsql](https://github.com/openstreetmap/osm2pgsql#installing) 1.4.1 or later to import your data into a PostGIS database
+* Python 3 with the psycopg2, yaml, and requests libraries (`python3-psycopg2` `python3-yaml` `python3-requests` packages on Debian-derived systems)
 * `ogr2ogr` for loading shapefiles into the database (`gdal-bin` on Debian-derived systems)
 
 ### Optional development dependencies

external-data.yml

@@ -2,7 +2,7 @@ settings:
   temp_schema: loading
   schema: public
   data_dir: data
-  database: gis
+  database: flex
   metadata_table: external_data
 sources:
   simplified_water_polygons:

indexes.sql

@@ -16,3 +16,4 @@ CREATE INDEX planet_osm_polygon_way_area_z6 ON planet_osm_polygon USING GIST (wa
 CREATE INDEX planet_osm_roads_admin ON planet_osm_roads USING GIST (way) WHERE boundary = 'administrative';
 CREATE INDEX planet_osm_roads_admin_low ON planet_osm_roads USING GIST (way) WHERE boundary = 'administrative' AND admin_level IN ('0', '1', '2', '3', '4');
 CREATE INDEX planet_osm_roads_roads_ref ON planet_osm_roads USING GIST (way) WHERE highway IS NOT NULL AND ref IS NOT NULL;
+CREATE INDEX planet_osm_route_member_id ON planet_osm_route USING btree (member_id);

indexes.yml

@@ -45,3 +45,8 @@ roads:
     where: boundary = 'administrative'
   roads_ref:
     where: highway IS NOT NULL AND ref IS NOT NULL
+route:
+  # The route table has no geospatial data, so it's index is a btree
+  member_id:
+    function: member_id
+    type: btree