Vtiles improvements - rename osm and non admin boundaries

.github/workflows/chartpress.yaml

@@ -4,7 +4,7 @@ on:
     branches:
       - 'main'
       - 'staging'
-      - 'configs_cgimap'
+      - 'test_deploy'
 jobs:
   build:
     runs-on: ubuntu-22.04
@@ -71,7 +71,7 @@ jobs:
           OHM_SLACK_WEBHOOK_URL: ${{ secrets.OHM_SLACK_WEBHOOK_URL }}
       ################ Staging secrets ################ 
       - name: Staging - substitute secrets
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/configs_cgimap'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/test_deploy'
         uses: bluwy/substitute-string-action@v1
         with:
           _input-file: 'values.staging.template.yaml'
@@ -189,14 +189,14 @@ jobs:
           PRODUCTION_OPENSTREETMAP_AUTH_SECRET: ${{ secrets.PRODUCTION_OPENSTREETMAP_AUTH_SECRET }}
 
       - name: AWS Credentials
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/configs_cgimap'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/test_deploy'
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
       - name: Setup Kubectl and Helm Dependencies
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/configs_cgimap'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/test_deploy'
         run: |
           sudo pip install awscli --ignore-installed six
           sudo curl -L -o /usr/bin/kubectl https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/kubectl
@@ -210,24 +210,25 @@ jobs:
           helm version
 
       - name: Update kube-config staging
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/configs_cgimap'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/test_deploy'
         run: aws eks --region us-east-1 update-kubeconfig --name osmseed-staging
       - name: Update kube-config prod
         if: github.ref == 'refs/heads/main'
         run: aws eks --region us-east-1 update-kubeconfig --name osmseed-production-v2
       - name: Add Helm repository
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/configs_cgimap'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/test_deploy'
         run: |
           helm repo add osm-seed https://osm-seed.github.io/osm-seed-chart/
           helm repo update
       - name: Install helm dependencies for
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/configs_cgimap'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/test_deploy'
         run: cd ohm && helm dep up
       # Staging
       - name: Staging - helm deploy
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/configs_cgimap'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/test_deploy'
         run: helm upgrade --install staging --wait ohm/ -f values.staging.yaml -f ohm/values.yaml
       # Production
       - name: Production - helm deploy
         if: github.ref == 'refs/heads/main'
-        run: helm upgrade --install production --wait ohm/ -f values.production.yaml -f ohm/values.yaml
+        run: helm upgrade --install production --wait ohm/ -f values.production.yaml -f ohm/values.yaml
+

.github/workflows/frontend-overpass.yaml

@@ -5,6 +5,7 @@ on:
     branches:
       - "main"
       - "staging"
+      - "fixed_pnpm"
 
 jobs:
   build:
@@ -15,12 +16,12 @@ jobs:
     steps:
 
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.8.0
+        uses: styfle/cancel-workflow-action@0.13.0
         with:
           access_token: ${{ github.token }}
 
       - name: Set environment variables - Staging
-        if: github.ref == 'refs/heads/staging'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/fixed_pnpm'
         uses: allenevans/set-env@v4.0.0
         with:
           OVERPASS_API: overpass-api.openhistoricalmap.org
@@ -36,15 +37,15 @@ jobs:
           CLOUDFRONT_DISTRIBUTION_ID: E24URY7SKM2LDD
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: "20.x"
 
       - name: Checkout overpass-turbo repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: OpenHistoricalMap/overpass-turbo
-          ref: 7a9c4bb794b2367970c052fbfb73dc7254e13455
+          ref: a64d500abc82744613b77bbb362e2cee98648d59
           path: overpass-turbo
 
       - name: Enable Corepack
@@ -55,15 +56,15 @@ jobs:
         working-directory: overpass-turbo
 
       - name: Install dependencies
-        run: yarn install
+        run: pnpm install
         working-directory: overpass-turbo
 
       - name: Build project
-        run: yarn build
+        run: pnpm build
         working-directory: overpass-turbo
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: "3.10"
 

.gitignore

@@ -33,3 +33,8 @@ hetzner/*/.envs.*.production
 hetzner/traefik/cloudflare-ips.txt
 hetzner/traefik/traefik.yml
 .vscode/
+imposm3.json
+
+cachedir_reimport/
+config_reimport.json
+imposm3_reimport.json

compose/tiler.yml

@@ -1,38 +1,41 @@
 services:
   db:
-    image: ohm-tiler-db:v1
+    image: rub21/ohm-tiler-db:v1
+    container_name: db
     build:
       context: ../images/tiler-db
       dockerfile: Dockerfile
     ports:
-      - "5432:5432"
-    # volumes:
-    #   - ../data/tiler-db-data2:/var/lib/postgresql/data
+      - "54321:5432"
+    volumes:
+      - tiler_pgdata:/var/lib/postgresql/data
     env_file:
       - ../envs/.env.tiler
     restart: always
     networks:
-      - tiler_network
+      - ohm_network
 
   imposm:
-    image: rub21/tiler-imposm:v70
+    image: rub21/tiler-imposm:v1
+    container_name: imposm
     build:
       context: ../images/tiler-imposm
       dockerfile: Dockerfile
     volumes:
       - ../images/tiler-imposm:/osm
-      - ../hetzner:/hetzner
+      - tiler_imposm_data:/mnt/data
     command:
       - sh
       - -c
       - "./start.sh"
     env_file:
       - ../envs/.env.tiler
     networks:
-      - tiler_network
+      - ohm_network
 
   tiler:
-    image: rub21/tiler-server:v73
+    image: rub21/tiler-server:v1
+    container_name: tiler
     build:
       context: ../images/tiler-server
       dockerfile: Dockerfile
@@ -45,39 +48,47 @@ services:
       - ../envs/.env.tiler
     restart: always
     networks:
-      - tiler_network
+      - ohm_network
 
-  tiler-cache:
-    image: rub21/tiler-cache:v2
-    build:
-      context: ../images/tiler-cache
-      dockerfile: Dockerfile
-    volumes:
-      - ../images/tiler-cache:/app
-    env_file:
-      - ../envs/.env.tiler
-    restart: always
-    networks:
-      - tiler_network
+  # tiler-cache:
+  #   image: rub21/tiler-cache:v2
+  #   build:
+  #     context: ../images/tiler-cache
+  #     dockerfile: Dockerfile
+  #   volumes:
+  #     - ../images/tiler-cache:/app
+  #   env_file:
+  #     - ../envs/.env.tiler
+  #   restart: always
+  #   networks:
+  #     - ohm_network
 
 
-  tiler-monitor:
-    image: rub21/tiler-monitor:v1
-    build:
-      context: ../images/tiler-monitor
-      dockerfile: Dockerfile
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ../images/tiler-monitor:/app
-      - ../hetzner:/app/hetzner
-    environment:
-      - DOCKER_CONFIG_ENVIRONMENT=staging
-    env_file:
-      - ../envs/.env.tiler
-    stdin_open: true
-    tty: true
+  # tiler-monitor:
+  #   image: rub21/tiler-monitor:v1
+  #   build:
+  #     context: ../images/tiler-monitor
+  #     dockerfile: Dockerfile
+  #   volumes:
+  #     - /var/run/docker.sock:/var/run/docker.sock
+  #     - ../images/tiler-monitor:/app
+  #     - ../hetzner:/app/hetzner
+  #   environment:
+  #     - DOCKER_CONFIG_ENVIRONMENT=staging
+  #   env_file:
+  #     - ../envs/.env.tiler
+  #   stdin_open: true
+  #   tty: true
 
 networks:
-  tiler_network:
-    driver: bridge
-
+  ohm_network:
+    external: true
+
+volumes:
+  tiler_pgdata:
+    driver: local
+    name: tiler_db
+
+  tiler_imposm_data:
+    driver: local
+    name: tiler_imposm

hetzner/tiler/tiler.base.yml

@@ -1,7 +1,7 @@
 services:
   tiler_server:
     container_name: tiler_server
-    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3225.h2122f3e
+    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3296.h0e45d176
     # image: tiler-server:staging
     # build:
     #   context: ../../images/tiler-server
@@ -15,14 +15,6 @@ services:
     #   - ../../images/tiler-server/start.sh:/app/start.sh:ro
     networks:
       - ohm_network
-
-volumes:
-  tiler_pgdata:
-    driver: local
-    name: tiler_db_11_02
-  tiler_imposm_data:
-    driver: local
-    name: tiler_imposm_11_02
 
 networks:
   ohm_network:

hetzner/tiler/tiler.production.yml

@@ -16,7 +16,7 @@ services:
 
   tiler_imposm:
     container_name: tiler_imposm
-    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3208.h6ef73bb
+    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3294.h12c71f95
     volumes:
       - tiler_imposm_data:/mnt/data
     env_file:
@@ -38,7 +38,7 @@ services:
   # Tiler server
   tiler_server:
     container_name: tiler_server
-    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3225.h2122f3e
+    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3296.h0e45d176
     # ports:
     #   - "9090:9090"
     restart: always
@@ -81,7 +81,7 @@ services:
 
   tile_global_seeding:
     container_name: tiler_global_seeding
-    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3225.h2122f3e
+    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3296.h0e45d176
     env_file:
       - .env.tiler
     volumes:
@@ -96,7 +96,7 @@ services:
 
   tile_coverage_seeding:
     container_name: tiler_coverage_seeding
-    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3225.h2122f3e
+    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3296.h0e45d176
     volumes:
       - ./seed.sh:/opt/seed.sh
     entrypoint:
@@ -128,10 +128,10 @@ services:
 volumes:
   tiler_pgdata:
     driver: local
-    name: tiler_db_11_02
+    name: tiler_db_25_02
   tiler_imposm_data:
     driver: local
-    name: tiler_imposm_11_02
+    name: tiler_imposm_25_02
 
 networks:
   ohm_network:

hetzner/tiler/tiler.staging.yml

@@ -12,19 +12,19 @@ services:
       - postgres
       - "-c"
       - "config_file=/etc/postgresql/postgresql.conf"
-    # ports:
-    #   - "54321:5432"
+    ports:
+      - "5432:5432"
     env_file:
       - .env.tiler
     networks:
       - ohm_network
   tiler_imposm:
     container_name: tiler_imposm
-    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3208.h6ef73bb
-    # image: tiler-imposm:staging
-    # build: 
-    #   context: ../../images/tiler-imposm
-    #   dockerfile: Dockerfile
+    # image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3208.h6ef73bb
+    image: tiler-imposm:staging
+    build: 
+      context: ../../images/tiler-imposm
+      dockerfile: Dockerfile
     volumes:
       - tiler_imposm_data:/mnt/data
     command:
@@ -41,15 +41,7 @@ volumes:
   tiler_pgdata:
     driver: local
     name: tiler_db_11_02
-    driver_opts:
-      type: none
-      o: bind
-      device: /mnt/HC_Volume_104590709/staging/tiler/pgdata
 
   tiler_imposm_data:
     driver: local
     name: tiler_imposm_11_02
-    driver_opts:
-      type: none
-      o: bind
-      device: /mnt/HC_Volume_104590709/staging/tiler/imposmdata