Merge pull request #2 from OpenTransitTools/2.x

2.x

Author: fpurcell

.env

@@ -0,0 +1,39 @@
+# This file defines default environment variables for all images
+
+# Layers definition and meta data
+TILESET_FILE=openmaptiles.yaml
+
+# Use 3-part patch version to ignore patch updates, e.g. 7.0.0
+TOOLS_VERSION=7.1
+
+# Make sure these values are in sync with the ones in .env-postgres file
+PGDATABASE=openmaptiles
+PGUSER=openmaptiles
+PGPASSWORD=openmaptiles
+PGHOST=postgres
+PGPORT=15432
+
+# Which zooms to generate with   make generate-tiles-pg
+MIN_ZOOM=0
+#MID_ZOOM=11
+MAX_ZOOM=16
+#MAX_ZOOM=7 # debug
+
+# Use  true  (case sensitive) to allow data updates
+DIFF_MODE=false
+
+# The current setup assumes this file is placed inside the data/ dir
+MBTILES_FILE=or-wa.mbtiles
+
+# This is the current repl_config.json location, pre-configured in the tools Dockerfile
+# Makefile and quickstart replace it with the dynamically generated one, but we keep it here in case some other method is used to run.
+IMPOSM_CONFIG_FILE=/usr/src/app/config/repl_config.json
+
+# Number of parallel processes to use when importing sql files
+MAX_PARALLEL_PSQL=5
+
+# Number of parallel threads to use when generating vector map tiles
+COPY_CONCURRENCY=10
+
+# Variables for generate tiles using tilelive-pgquery
+PGHOSTS_LIST=

CHANGES.txt

@@ -1,3 +1,8 @@
+1.0.1(2025-05-05)
+------------------
+- up's OMT to 2.1.3 and refactor the repo for simple build and hosting
+- new trimet styles and the like
+
 1.0.0 (2021-05-10)
 ------------------
 - removes the python junk to simplify the project / structure

Makefile

@@ -0,0 +1 @@
+scripts/Makefile

data/or-wa.bbox

@@ -0,0 +1 @@
+-125,40,-120,50

data/or-wa.osm.pbf

@@ -0,0 +1 @@
+or-wa-carto.osm.pbf

docker-compose.yml

@@ -0,0 +1,143 @@
+# This version must match the MAKE_DC_VERSION value below
+version: "2.8"
+
+volumes:
+  pgdata:
+
+networks:
+  postgres:
+    driver: bridge
+
+services:
+
+  postgres:
+    image: "${POSTGIS_IMAGE:-openmaptiles/postgis}:${TOOLS_VERSION}"
+    # Use "command: postgres -c jit=off" for PostgreSQL 11+ because of slow large MVT query processing
+    # Use "shm_size: 512m" if you want to prevent a possible 'No space left on device' during 'make generate-tiles-pg'
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    networks:
+      - postgres
+    ports:
+      - "${PGPORT:-5432}:${PGPORT:-5432}"
+    env_file: .env
+    environment:
+      # postgress container uses old variable names
+      POSTGRES_DB: ${PGDATABASE:-openmaptiles}
+      POSTGRES_USER: ${PGUSER:-openmaptiles}
+      POSTGRES_PASSWORD: ${PGPASSWORD:-openmaptiles}
+      PGPORT: ${PGPORT:-5432}
+
+  import-data:
+    image: "openmaptiles/import-data:${TOOLS_VERSION}"
+    env_file: .env
+    networks:
+      - postgres
+
+  openmaptiles-tools: &openmaptiles-tools
+    image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
+    env_file: .env
+    environment:
+      # Must match the version of this file (first line)
+      # download-osm will use it when generating a composer file
+      MAKE_DC_VERSION: "2.8"
+      # Allow DIFF_MODE, MIN_ZOOM, and MAX_ZOOM to be overwritten from shell
+      DIFF_MODE: ${DIFF_MODE}
+      MIN_ZOOM: ${MIN_ZOOM}
+      MAX_ZOOM: ${MAX_ZOOM}
+      #Provide BBOX from *.bbox file if exists, else from .env
+      BBOX: ${BBOX}
+      # Imposm configuration file describes how to load updates when enabled
+      IMPOSM_CONFIG_FILE: ${IMPOSM_CONFIG_FILE}
+      # Control import-sql processes
+      MAX_PARALLEL_PSQL: ${MAX_PARALLEL_PSQL}
+      PGDATABASE: ${PGDATABASE:-openmaptiles}
+      PGUSER: ${PGUSER:-openmaptiles}
+      PGPASSWORD: ${PGPASSWORD:-openmaptiles}
+      PGPORT: ${PGPORT:-5432}
+      MBTILES_FILE: ${MBTILES_FILE}
+    networks:
+      - postgres
+    volumes:
+      - .:/tileset
+      - ./data:/import
+      - ./data:/export
+      - ./build/sql:/sql
+      - ./build:/mapping
+      - ./cache:/cache
+      - ./style:/style
+
+  update-osm:
+    <<: *openmaptiles-tools
+    command: import-update
+
+  generate-changed-vectortiles:
+    image: "openmaptiles/generate-vectortiles:${TOOLS_VERSION}"
+    command: ./export-list.sh
+    volumes:
+      - ./data:/export
+      - ./build/openmaptiles.tm2source:/tm2source
+    networks:
+      - postgres
+    env_file: .env
+    environment:
+      MBTILES_NAME: ${MBTILES_FILE}
+      # Control tilelive-copy threads
+      COPY_CONCURRENCY: ${COPY_CONCURRENCY}
+      PGDATABASE: ${PGDATABASE:-openmaptiles}
+      PGUSER: ${PGUSER:-openmaptiles}
+      PGPASSWORD: ${PGPASSWORD:-openmaptiles}
+      PGPORT: ${PGPORT:-5432}
+
+  generate-vectortiles:
+    image: "openmaptiles/generate-vectortiles:${TOOLS_VERSION}"
+    volumes:
+      - ./data:/export
+      - ./build/openmaptiles.tm2source:/tm2source
+    networks:
+      - postgres
+    env_file: .env
+    environment:
+      MBTILES_NAME: ${MBTILES_FILE}
+      BBOX: ${BBOX}
+      MIN_ZOOM: ${MIN_ZOOM}
+      MAX_ZOOM: ${MAX_ZOOM}
+      # Control tilelive-copy threads
+      COPY_CONCURRENCY: ${COPY_CONCURRENCY}
+      #
+      PGDATABASE: ${PGDATABASE:-openmaptiles}
+      PGUSER: ${PGUSER:-openmaptiles}
+      PGPASSWORD: ${PGPASSWORD:-openmaptiles}
+      PGPORT: ${PGPORT:-5432}
+
+  postserve:
+    image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
+    command: "postserve ${TILESET_FILE} --verbose --serve=${OMT_HOST:-http://localhost}:${PPORT:-8090}"
+    env_file: .env
+    environment:
+      TILESET_FILE: ${TILESET_FILE}
+    networks:
+      - postgres
+    ports:
+      - "${PPORT:-8090}:${PPORT:-8090}"
+    volumes:
+      - .:/tileset
+
+  maputnik_editor:
+    image: "maputnik/editor"
+    ports:
+      - "8088:8888"
+
+  tileserver-gl:
+    image: "maptiler/tileserver-gl:v5.1.3"
+    command:
+      - --port
+      - "${TPORT:-8080}"
+      - --config
+      - "/style/config.json"
+    restart: always
+    ports:
+      - "${TPORT:-8080}:${TPORT:-8080}"
+    volumes:
+      - ./data:/data
+      - ./style:/style