Vtiles improvements - communication_lines, transport_lines and route_lines (#703)

* Include street and communication layers in vtiles

* Update imposm config to import data to routes and communication multilines

* update sql scripts

* Update imposm configs

* Update tiler compose

* update comunication

* script to reimport

* update to reimport tables

* Update

* Create a Mview for transport lines

* Update communication mview

* Add highway in routes_line layer

* Update columns for communication

* Update communication props

* Display communication from zoom 10 on

* Do not returm empty values for communitacion_lines layer

* Add relation attribute

* Display the way itseff too.

* Merge results in only one feature in case the attributes are the same

* Update branch naem to generate docker images

Author: Rub21

.github/workflows/chartpress.yaml

@@ -4,7 +4,7 @@ on:
     branches:
       - 'main'
       - 'staging'
-      - 'configs_cgimap'
+      - 'communication_and_street'
 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/communication_and_street'
         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/communication_and_street'
         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/communication_and_street'
         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/configs_cgimap'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/communication_and_street'
         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/communication_and_street'
         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/communication_and_street'
         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/communication_and_street'
         run: helm upgrade --install staging --wait ohm/ -f values.staging.yaml -f ohm/values.yaml
       # Production
       - name: Production - helm deploy

.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