Tiler updates and add attributes (#743)

* Rename purge to fresh_tiles  for bypass in martin

* Update website to pass fresh_tiles argument to fetch fresh vtiles

* Update bypass argument name for martin-nginx

* Update ohm website

* Skip relations without a member for monitor

* Update docker image monitor

* Include track, path, footway, cycleway, pedestrian, living_street, steps, bridleway in mv_transport_lines_z13_15

* Add expressway in transport_lines

* Add imposm config to expose airport codes

* Update config to import tiler db

* Update config for taginfo and osmcha

* Update buffer to clic a object and get info

* Add nulls as parameters for create_areas_mview to overwrite ref values

* Update values for tiler docekr images

* Update martin docker image

Author: Rub21

.github/workflows/chartpress.yaml

@@ -4,7 +4,7 @@ on:
     branches:
       - 'main'
       - 'staging'
-      - 'martin_vtiles'
+      - 'req_fresh_tiles'
 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/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/req_fresh_tiles'
         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/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/req_fresh_tiles'
         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/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/req_fresh_tiles'
         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,22 +210,22 @@ jobs:
           helm version
 
       - name: Update kube-config staging
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/req_fresh_tiles'
         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/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/req_fresh_tiles'
         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/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/req_fresh_tiles'
         run: cd ohm && helm dep up
       # Staging
       - name: Staging - helm deploy
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/martin_vtiles'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/req_fresh_tiles'
         run: helm upgrade --install staging --wait ohm/ -f values.staging.yaml -f ohm/values.yaml
       # Production
       - name: Production - helm deploy

compose/tiler.yml

@@ -72,24 +72,24 @@ services:
   #     - ohm_network
 
 
-  tiler-monitor:
-    image: rub21/tiler-monitor:v2
-    build:
-      context: ../images/tiler-monitor
-      dockerfile: Dockerfile
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ../hetzner:/app/hetzner
-      - tiler_monitor_data:/data
-    ports:
-      - "8001:8001"
-    environment:
-      - TILER_MONITORING_DOCKER_CONFIG_ENVIRONMENT=staging
-    env_file:
-      - ../envs/.env.tiler
-    restart: always
-    networks:
-      - ohm_network
+  # tiler-monitor:
+  #   image: rub21/tiler-monitor:v2
+  #   build:
+  #     context: ../images/tiler-monitor
+  #     dockerfile: Dockerfile
+  #   volumes:
+  #     - /var/run/docker.sock:/var/run/docker.sock
+  #     - ../hetzner:/app/hetzner
+  #     - tiler_monitor_data:/data
+  #   ports:
+  #     - "8001:8001"
+  #   environment:
+  #     - TILER_MONITORING_DOCKER_CONFIG_ENVIRONMENT=staging
+  #   env_file:
+  #     - ../envs/.env.tiler
+  #   restart: always
+  #   networks:
+  #     - ohm_network
 
 networks:
   ohm_network:
@@ -98,12 +98,12 @@ networks:
 volumes:
   tiler_pgdata:
     driver: local
-    name: tiler_db
+    name: tiler_db_1704
 
   tiler_imposm_data:
     driver: local
-    name: tiler_imposm
+    name: tiler_imposm_1704
 
   tiler_monitor_data:
     driver: local
-    name: tiler_monitor
+    name: tiler_monitor_1704

hetzner/osmcha/osmcha.production.yml

@@ -4,10 +4,10 @@ services:
     container_name: osmcha_ohmx_adiff
     environment:
       - API_URL=https://api.${OHM_DOMAIN}
-      - PLANET_PBF_URL=https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/planet-260408_0307.osm.pbf
+      - PLANET_PBF_URL=https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/planet-260418_0301.osm.pbf
       - MINUTE_REPLICATION_URL=https://planet.openhistoricalmap.org/?prefix=replication/minute/
       # Add OSMX_INITIAL_SEQNUM to start from a specific sequence number
-      # - OSMX_INITIAL_SEQNUM=1900000
+      - OSMX_INITIAL_SEQNUM=1900000
       - AWS_S3_BUCKET=planet.openhistoricalmap.org
     env_file:
       - ./.env.osmcha

hetzner/taginfo/taginfo.base.yml

@@ -5,6 +5,16 @@ services:
     env_file:
       - ./.env.taginfo
     restart: always
+    command:
+      - /bin/bash
+      - -lc
+      - |
+        set -ex
+        while true; do
+          rm -rf /usr/src/app/data/*.db
+          /usr/src/app/start.sh
+          sleep 270000
+        done
     networks:
       - ohm_network
 

hetzner/taginfo/taginfo.production.yml

@@ -15,19 +15,11 @@ services:
       - -lc
       - |
         set -ex
-        echo "#!/bin/bash
-        rm -rf /usr/src/app/data/*
-        /usr/src/app/start.sh
-        sleep 7200
-        # restart web container
-        curl -v -X POST --unix-socket /var/run/docker.sock http://localhost/v1.41/containers/taginfo_web/restart" > /run_task.sh
-        chmod +x /run_task.sh
-        /run_task.sh
-        # 2. Set cron: Run every 3 days at 3:00 AM
-        echo "0 8 */3 * * /run_task.sh >> /var/log/taginfo-cron.log 2>&1" | crontab -
-        
-        touch /var/log/taginfo-cron.log
-        cron -f
+        while true; do
+          rm -rf /usr/src/app/data/*
+          /usr/src/app/start.sh
+          sleep 259200
+        done
     env_file:
       - ./.env.taginfo
     networks:

hetzner/tiler/tiler.production.yml

@@ -18,7 +18,7 @@ services:
 
   tiler_imposm:
     container_name: tiler_imposm
-    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3374.h513ba86f
+    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3356.h880c9a8b
     volumes:
       - tiler_imposm_data:/mnt/data
     env_file:
@@ -121,7 +121,7 @@ services:
 
   tiler_monitor:
     container_name: tiler_monitor
-    image: ghcr.io/openhistoricalmap/tiler-monitor:0.0.1-0.dev.git.3364.hd63ad03e
+    image: ghcr.io/openhistoricalmap/tiler-monitor:0.0.1-0.dev.git.3348.h4fbb83d8
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       # - ../../images/tiler-monitor:/app
@@ -138,12 +138,14 @@ services:
 
   tiler_server_martin:
     container_name: tiler_server_martin
-    image:  ghcr.io/openhistoricalmap/tiler-server-martin:0.0.1-0.dev.git.3374.h513ba86f
+    image: ghcr.io/openhistoricalmap/tiler-server-martin:0.0.1-0.dev.git.3357.he67b0015
     restart: always
     environment:
       - OHM_DOMAIN=${OHM_DOMAIN:-openhistoricalmap.org}
     env_file:
       - .env.tiler
+    ports:
+      - "3030:80"
     volumes:
       - tiler_martin_nginx_cache:/var/cache/nginx
     networks:
@@ -153,16 +155,16 @@ services:
 volumes:
   tiler_pgdata:
     driver: local
-    name: tiler_db
+    name: tiler_db_1704
   tiler_imposm_data:
     driver: local
-    name: tiler_imposm
+    name: tiler_imposm_1704
   tiler_monitor_data:
     driver: local
-    name: tiler_monitor_data_v3
+    name: tiler_monitor_1704
   tiler_martin_nginx_cache:
     driver: local
-    name: tiler_martin_nginx_cache
+    name: tiler_martin_nginx_cache_1704
 networks:
   ohm_network:
     external: true

images/tiler-imposm/config/layers/street_multilines.json

@@ -112,6 +112,11 @@
           "name": "route",
           "key": "route"
         },
+        {
+          "type": "string",
+          "name": "expressway",
+          "key": "expressway"
+        },
         {
           "type": "string",
           "name": "start_date",

images/tiler-imposm/config/layers/transport_areas.json

@@ -41,6 +41,26 @@
           "name": "class",
           "key": null
         },
+        {
+          "type": "string",
+          "name": "ref",
+          "key": "ref"
+        },
+        {
+          "type": "string",
+          "name": "iata",
+          "key": "iata"
+        },
+        {
+          "type": "string",
+          "name": "icao",
+          "key": "icao"
+        },
+        {
+          "type": "string",
+          "name": "faa",
+          "key": "faa"
+        },
         {
           "type": "string",
           "name": "start_date",

images/tiler-imposm/config/layers/transport_lines.json

@@ -111,6 +111,11 @@
           "name": "route",
           "key": "route"
         },
+        {
+          "type": "string",
+          "name": "expressway",
+          "key": "expressway"
+        },
         {
           "type": "string",
           "name": "start_date",

images/tiler-imposm/config/layers/transport_multilines.json

@@ -126,6 +126,11 @@
           "name": "route",
           "key": "route"
         },
+        {
+          "type": "string",
+          "name": "expressway",
+          "key": "expressway"
+        },
         {
           "key": "type",
           "name": "relation_type",