Rebase, rename and MAP-files (#589)

* Set db pw on 1st build op database. * Set up MapServer image to serve topografie files for tiling. * Change to new brt_10 tables. Add ferries. * Add filter for ferries. * Differentiate electrification of trains. * Add infrastructure to include bridges. * Align zoomlevels to work with both RD and WM. * First pass to get data from refDB. * Align maxscaledenom with tile schemes. * Mount volumes. Remove version. Change filename. * Set up MapServer image to serve topografie files for tiling. * Change to new brt_10 tables. Add ferries. * Add filter for ferries. * Differentiate electrification of trains. * Add infrastructure to include bridges. * Align zoomlevels to work with both RD and WM. * First pass to get data from refDB. * Align maxscaledenom with tile schemes. * Mount volumes. Remove version. Change filename. * Typos as incoming change was not resolved. * Re-introduce metro lines. * Configuration of permanent storage of database using volume was broken. * Rewrite queries and update db connections. * Only include visible layers. Align scaledenominators to tile scheme. * Further specify scaledenominators. Add bridge numbers at deeper zoom levels. * Don't use KBK10 Plus labels for bridge names/numbers at zl13. * BGT labels. * Add binnentuinen and simplify rendering. * Also show ferry at street-level maps.
Amsterdam · Sep 4, 2024 · cc27177 · cc27177
1 parent d3cae7e
commit cc27177
Show file tree

Hide file tree

Showing 7 changed files with 1,091 additions and 1,094 deletions.
diff --git a/Dockerfile.topografie b/Dockerfile.topografie
@@ -0,0 +1,8 @@
+ARG BASE_IMAGE
+
+FROM ${BASE_IMAGE}
+
+# Copy referentiekaarten mapfiles into the root dir so they will be served
+
+RUN rm -rf /srv/mapserver/private
+COPY /referentiekaarten/ /srv/mapserver/
diff --git a/compose.yml b/compose.yml
@@ -0,0 +1,122 @@
+# This file is only for local development purposes. The actual deployment
+# configuration lives in a separate repository.
+services:
+  database:
+    build:
+      context: .
+      dockerfile: Dockerfile.database
+    ports:
+      - "5403:5432"
+    environment:
+      - POSTGRES_PASSWORD=insecure
+      - POSTGRES_DB=postgres
+
+    command: ["postgres", "-c", "log_statement=all"]
+    volumes:
+      - "${POSTGRES_DATA_DIR:-/var/lib/postgresql/data}:/var/lib/postgresql/data"
+
+  proxy:
+    build:
+      context: jwtproxy
+      dockerfile: Dockerfile.dev
+    ports:
+      - 9191:8000
+    volumes:
+      - ./jwtproxy/src:/app/jwtproxy
+    environment:
+      PROXY_URL: http://map
+      JWKS_PATH: /app/jwtproxy/test_jwk.json
+      LOG_LEVEL: DEBUG
+      #JWKS_URL: "https://iam.amsterdam.nl/auth/realms/datapunt-ad-acc/protocol/openid-connect/certs"
+
+  # Bare bones 'webserver' to behave as public loadbalancer
+  publicdummy:
+    image: python:3.11-slim-bullseye
+    ports:
+      - 8000:8000
+    command: python3 -m http.server 8000
+
+  map:
+    build:
+      context: .
+    ports:
+      - "8383:80"
+    environment:
+      # Used by apache to allow complete access for local dev
+      LOCAL: "true"
+
+      PANORAMA_DB_NAME: panorama
+      PANORAMA_DB_USER: postgres
+      PANORAMA_DB_PASSWORD: insecure
+      PANORAMA_DB_HOST: database
+
+      DATASERVICES_DB_NAME: postgres
+      DATASERVICES_DB_USER: postgres
+      DATASERVICES_DB_PASSWORD_PATH: insecure
+      DATASERVICES_DB_HOST: database
+
+      MAP_URL: "http://map"
+      LEGEND_URL: "http://map"
+
+    volumes:
+      - .:/srv/mapserver/
+
+  privatemap:
+    build:
+      context: .
+      dockerfile: Dockerfile.private
+    ports:
+      - "8384:80"
+    environment:
+      # Used by apache to allow complete access for local dev
+      LOCAL: "true"
+
+      PANORAMA_DB_NAME: panorama
+      PANORAMA_DB_USER: postgres
+      PANORAMA_DB_PASSWORD: insecure
+      PANORAMA_DB_HOST: database
+
+      DATASERVICES_DB_NAME: postgres
+      DATASERVICES_DB_USER: postgres
+      DATASERVICES_DB_PASSWORD_PATH: insecure
+      DATASERVICES_DB_HOST: database
+
+      MAP_URL: "http://map"
+      LEGEND_URL: "http://map"
+
+    volumes:
+      - ./tools/:/srv/mapserver/tools/
+      - ./symbols/:/srv/mapserver/symbols/
+      - ./fonts/:/srv/mapserver/fonts/
+      - ./connection/:/srv/mapserver/connection/
+      - ./private:/srv/mapserver/
+
+  topomap:
+    build:
+      context: .
+      dockerfile: Dockerfile.topografie
+    ports:
+      - "8385:80"
+    environment:
+      # Used by apache to allow complete access for local dev
+      LOCAL: "true"
+
+      PANORAMA_DB_NAME: panorama
+      PANORAMA_DB_USER: postgres
+      PANORAMA_DB_PASSWORD: insecure
+      PANORAMA_DB_HOST: database
+
+      DATASERVICES_DB_NAME: postgres
+      DATASERVICES_DB_USER: postgres
+      DATASERVICES_DB_PASSWORD_PATH: insecure
+      DATASERVICES_DB_HOST: database
+
+      MAP_URL: "http://map"
+      LEGEND_URL: "http://map"
+
+    volumes:
+      - ./tools/:/srv/mapserver/tools/
+      - ./symbols/:/srv/mapserver/symbols/
+      - ./fonts/:/srv/mapserver/fonts/
+      - ./connection/:/srv/mapserver/connection/
+      - ./referentiekaarten/:/srv/mapserver/
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
@@ -8,11 +8,6 @@ PANORAMA_DB_NAME=${PANORAMA_DB_NAME:-panorama}
 PANORAMA_DB_USER=${PANORAMA_DB_USER:-${PANORAMA_DB_NAME}}
 PANORAMA_DB_PASSWORD_PATH=${PANORAMA_DB_PASSWORD_PATH:-'/mnt/secrets-store/mapserver-public'}
 
-BASISKAART_DB_PORT=${BASISKAART_DB_PORT:-5432}
-BASISKAART_DB_NAME=${BASISKAART_DB_NAME:-basiskaart}
-BASISKAART_DB_USER=${BASISKAART_DB_USER:-${BASISKAART_DB_NAME}}
-BASISKAART_DB_PASSWORD_PATH=${BASISKAART_DB_PASSWORD_PATH:-'/mnt/secrets-store/mapserver-public'}
-
 DATASERVICES_DB_PORT=${DATASERVICES_DB_PORT:-5432}
 DATASERVICES_DB_NAME=${DATASERVICES_DB_NAME:-dataservices}
 DATASERVICES_DB_USER=${DATASERVICES_DB_USER:-${DATASERVICES_DB_NAME}}
@@ -26,12 +21,6 @@ CONNECTION "host=${PANORAMA_DB_HOST} dbname=${PANORAMA_DB_NAME} user=${PANORAMA_
 PROCESSING "CLOSE_CONNECTION=DEFER"
 EOF
 
-cat > /srv/mapserver/connection/basiskaart.inc <<EOF
-CONNECTIONTYPE postgis
-CONNECTION "host=${BASISKAART_DB_HOST} dbname=${BASISKAART_DB_NAME} user=${BASISKAART_DB_USER} password=$(cat ${BASISKAART_DB_PASSWORD_PATH}) port=${BASISKAART_DB_PORT}"
-PROCESSING "CLOSE_CONNECTION=DEFER"
-EOF
-
 cat > /srv/mapserver/connection/dataservices.inc <<EOF
 CONNECTIONTYPE postgis
 CONNECTION "host=${DATASERVICES_DB_HOST} dbname=${DATASERVICES_DB_NAME} user=${DATASERVICES_DB_USER} password=$(cat ${DATASERVICES_DB_PASSWORD_PATH}) port=${DATASERVICES_DB_PORT}"