Release 2024-01-26 (FixMyBerlin/atlas-geo#85)

Author: rush42

atlas-geo/.env.example

@@ -15,8 +15,6 @@ SKIP_TAG_FILTER=0 # skips tag filtering
 DEBUG=1 # enables the generation of exclude tables
 ID_FILTER='' # if not empty only the objects with these ids are processed. See https://docs.osmcode.org/osmium/latest/osmium-getid.html
 
-# Internal API secret
-API_SECRET=myapisecret
 
 # Token for Synology log. Leave blank to disable logging
 SYNOLOGY_LOG_TOKEN=

atlas-geo/.github/workflows/deployment.production.yml

@@ -10,9 +10,7 @@ jobs:
     uses: ./.github/workflows/deployment.yml
     with:
       ENVIRONMENT: production
-      URL: https://tiles.radverkehrsatlas.de
-      TILES_URL: tiles.radverkehrsatlas.de
-      API_URL: api.radverkehrsatlas.de
+      URL: tiles.radverkehrsatlas.de
     secrets:
       SERVICE_NAME: ${{ secrets.SERVICE_NAME }}
       DATABASE_NAME: ${{ secrets.DATABASE_NAME }}

atlas-geo/.github/workflows/deployment.staging.yml

@@ -10,9 +10,7 @@ jobs:
     uses: ./.github/workflows/deployment.yml
     with:
       ENVIRONMENT: staging
-      URL: https://staging-tiles.radverkehrsatlas.de
-      TILES_URL: staging-tiles.radverkehrsatlas.de
-      API_URL: staging-api.radverkehrsatlas.de
+      URL: staging-tiles.radverkehrsatlas.de
     secrets:
       SERVICE_NAME: ${{ secrets.SERVICE_NAME }}
       DATABASE_NAME: ${{ secrets.DATABASE_NAME }}

atlas-geo/.github/workflows/deployment.yml

@@ -36,19 +36,13 @@ on:
       URL:
         type: string
         required: true
-      TILES_URL:
-        type: string
-        required: true
-      API_URL:
-        type: string
-        required: true
 
 jobs:
   build_and_deploy:
     runs-on: ubuntu-latest
     environment:
       name: ${{ inputs.ENVIRONMENT }}
-      url: ${{ inputs.URL }}
+      url: https://${{ inputs.URL }}
     steps:
       - uses: actions/checkout@v4
 
@@ -89,22 +83,6 @@ jobs:
           aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/n0p8j4k5/
           docker push public.ecr.aws/n0p8j4k5/atlas/app:${{ github.sha }}
 
-      - name: Build api image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./api.Dockerfile
-          push: false
-          load: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: public.ecr.aws/n0p8j4k5/atlas/api:${{ github.sha }}
-
-      - name: Push API image
-        run: |
-          aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/n0p8j4k5/
-          docker push public.ecr.aws/n0p8j4k5/atlas/api:${{ github.sha }}
-
       - name: Copy files to server
         uses: appleboy/scp-action@master
         with:
@@ -134,10 +112,8 @@ jobs:
             echo PGPASSWORD='${{ secrets.DATABASE_PASSWORD }}' >> .env
             echo PGDATABASE='${{ secrets.DATABASE_NAME }}' >> .env
             echo OSM_DOWNLOAD_URL='${{ vars.OSM_DOWNLOAD_URL }}' >> .env
-            echo TILES_URL='${{ inputs.TILES_URL }}' >> .env
-            echo API_URL='${{ inputs.API_URL }}' >> .env
+            echo URL='${{ inputs.URL }}' >> .env
             echo GITHUB_SHA='${{ github.sha }}' >> .env
-            echo API_SECRET=$(echo $RANDOM | md5sum | head -c 20) >> .env
             echo "Reload containers"
             docker compose -f docker-compose.traefik.yml up -d
             docker compose up -d

atlas-geo/api.Dockerfile

@@ -14,8 +14,8 @@ local table = osm2pgsql.define_table({
   }
 })
 
-local tableLabel = osm2pgsql.define_table({
-  name = 'boundariesLabel',
+local labelTable = osm2pgsql.define_table({
+  name = 'boundaryLabels',
   ids = { type = 'any', id_column = 'osm_id', type_column = 'osm_type' },
   columns = {
     { column = 'tags', type = 'jsonb' },
@@ -76,7 +76,7 @@ function osm2pgsql.process_relation(object)
     meta = Metadata(object),
     geom = object:as_multipolygon()
   })
-  tableLabel:insert({
+  labelTable:insert({
     tags = results_tags,
     meta = Metadata(object),
     geom = object:as_multipolygon():centroid()

atlas-geo/api/INIT_FUNCTIONS.sql

@@ -17,7 +17,7 @@ fi
 echo "Downloading file: ${OSM_DOWNLOAD_URL}"
 # Note: Showing the progress (locally) is very verbose, unfortunately
 if wget --timestamping --no-verbose ${OSM_DOWNLOAD_URL} --directory-prefix=${OSM_DATADIR}; then
-  mv ${OSM_DOWNLOAD_FILE} ${OSM_LOCAL_FILE}
+  ln -f ${OSM_DOWNLOAD_FILE} ${OSM_LOCAL_FILE}
 else
   echo "Error: Failed to download the file from ${OSM_DOWNLOAD_URL}"
 fi

atlas-geo/api/INIT_VERIFICATION_VIEWS.sql

@@ -14,12 +14,6 @@ run_psql "roads_bikelanes/bikelanes/bikelanes"
 
 run_lua "bicycleParking/bicycleParking"
 
-# run_lua "legacy_bikelanes/bikelanesPresence"
-# run_lua "legacy_surfaceQuality/surfaceQuality"
-# run_lua "legacy_roadClassification/roadClassification"
-# run_lua "legacy_maxspeed/maxspeed"
-# run_lua "legacy_lit/lit"
-
 run_lua "trafficSigns/trafficSigns"
 run_psql "trafficSigns/trafficSigns"
 
@@ -38,6 +32,7 @@ echo "✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ 
 echo -e "\e[1m\e[7m PROCESS – END \e[27m\e[21m – End Time: $(date)\e[0m"
 echo "Completed:"
 echo "Development http://localhost:3000/catalog"
-echo "Staging https://staging-tiles.radverkehrsatlas.de/"
-echo "Production https://tiles.radverkehrsatlas.de"
+echo "Staging https://staging-tiles.radverkehrsatlas.de/catalog"
+echo "Production https://tiles.radverkehrsatlas.de/catalog"
+echo "Test-Map https://data.radverkehrsatlas.de/"
 echo "✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ "

atlas-geo/api/README.md

@@ -46,17 +46,13 @@ process_end_time=$(date +%s)
 export PROCESS_RUN_TIME_DIFF=$((process_end_time - process_start_time)) # used by metadata.sh
 
 if ! ./run-5-postprocess.sh; then
-    alert '*ERROR*: #run-6-postprocess exited with non-zero status code'
+    alert '*ERROR*: #run-5-postprocess exited with non-zero status code'
 fi
 
-if ! ./run-6-api.sh; then
-    alert '*ERROR*: #run-7-api exited with non-zero status code'
+if ! ./run-6-analysis.sh; then
+    alert '*ERROR*: #run-6-analysis exited with non-zero status code'
 fi
 
-if ! ./run-7-analysis.sh; then
-    alert '*ERROR*: #run-5-analysis exited with non-zero status code'
-fi
-
-if ! ./run-8-metadata.sh; then
-    alert '*ERROR*: #run-8-metadata exited with non-zero status code'
+if ! ./run-7-metadata.sh; then
+    alert '*ERROR*: #run-7-metadata exited with non-zero status code'
 fi

atlas-geo/api/db.py

@@ -39,22 +39,6 @@ services:
     depends_on:
       db:
         condition: service_healthy
-  api:
-    build:
-      context: .
-      dockerfile: ./api.Dockerfile
-    container_name: api
-    environment:
-      PGHOST:
-      PGDATABASE:
-      PGUSER:
-      PGPASSWORD:
-      API_SECRET:
-    ports:
-      - 80:80
-    depends_on:
-      db:
-        condition: service_healthy
   db:
     image: postgis/postgis:14-3.3-alpine
     shm_size: 1gb

atlas-geo/api/db_configuration.py

@@ -37,7 +37,7 @@ services:
       - 3333:3000
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.tiles.rule=Host(`${TILES_URL}`)"
+      - "traefik.http.routers.tiles.rule=Host(`${URL}`)"
       - "traefik.http.routers.tiles.entrypoints=websecure"
       - "traefik.http.routers.tiles.tls.certresolver=letsencrypt"
       - "traefik.http.routers.tiles.tls=true"
@@ -46,29 +46,6 @@ services:
     depends_on:
       db:
        condition: service_healthy
-  api:
-    image: public.ecr.aws/n0p8j4k5/atlas/api:${GITHUB_SHA}
-    container_name: api
-    environment:
-      PGHOST:
-      PGDATABASE:
-      PGUSER:
-      PGPASSWORD:
-      API_SECRET:
-    restart: unless-stopped
-    ports:
-      - "8020:80"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.api.rule=Host(`${API_URL}`)"
-      - "traefik.http.routers.api.entrypoints=websecure"
-      - "traefik.http.routers.api.tls.certresolver=letsencrypt"
-      - "traefik.http.routers.api.tls=true"
-    networks:
-      - app_bridge
-    depends_on:
-      db:
-        condition: service_healthy
   db:
     image: postgis/postgis:14-3.3-alpine
     container_name: db