Update map-styles, iD editor, Imposm config and fix network:wikidata (#727)

* Addresses OpenHistoricalMap/issues#1312 w/map-styles-0.9.13

* Addresses OpenHistoricalMap/issues#1312 w/updated timeslider source

* Update Imposm template and fix  network:wikidata for routes (#724)

* Change role for imposm in tiler db

* Include network_wikidata for new import

* Update branch to build docker image

* Update values to deploy in production

* Fix network:wikidata for routes

* Fix docker container for imposm

* id-v2.29.6

* OpenHistoricalMap/issues#1309: corrects spelling in prod template

* Fix extra tags for nominatim (#728)

---------

Co-authored-by: Eric Theise <erictheise@gmail.com>

Author: Rub21

.github/workflows/chartpress.yaml

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

hetzner/nominatim/nominatim.base.yml

@@ -20,7 +20,7 @@ services:
       NOMINATIM_ADDRESS_LEVEL_CONFIG_URL: https://raw.githubusercontent.com/OpenHistoricalMap/nominatim-ui/master/address-levels.json
       UPDATE_MODE: continuous
       IMPORT_STYLE: extratags
-      EXTRA_TAGS: "start_date,start_date:edtf,end_date,end_date:edt"
+      EXTRA_TAGS: "start_date,start_date:edtf,end_date,end_date:edtf"
     restart: always
     healthcheck:
       test: ["CMD-SHELL", "curl -f http://localhost:8080/status || exit 1"]

hetzner/tiler/tiler.production.yml

@@ -17,7 +17,7 @@ services:
 
   tiler_imposm:
     container_name: tiler_imposm
-    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3323.haf36ae7d
+    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3323.h6950acce
     volumes:
       - tiler_imposm_data:/mnt/data
     env_file:
@@ -137,10 +137,10 @@ services:
 volumes:
   tiler_pgdata:
     driver: local
-    name: tiler_db_16_03
+    name: tiler_db_17_03
   tiler_imposm_data:
     driver: local
-    name: tiler_imposm_16_03
+    name: tiler_imposm_17_03
 
 networks:
   ohm_network:

images/tiler-imposm/config/imposm3.template.json

@@ -89,51 +89,14 @@
       "traffic_signals",
       "traffic_signals:*",
       "button_operated",
-      "sidewalk",
       "sidewalk:*",
-      "parking",
       "parking:*",
       "lit",
       "smoothness",
       "direction",
-      "ele",
-
-      "building",
-      "natural",
-      "landuse",
-      "highway",
-      "railway",
-      "aeroway",
-      "waterway",
-      "barrier",
-      "leisure",
-      "historic",
-      "man_made",
-      "power",
-      "military",
-      "amenity",
-      "place",
-      "tourism",
-      "shop",
-      "craft",
-      "boundary",
-      "communication",
-      "route",
-      "start_date",
-      "end_date",
-      "name",
-      "oneway",
-      "bridge",
-      "access",
-      "service",
-      "ford",
-      "surface",
-      "lanes",
-      "maxspeed",
-      "admin_level",
-      "type"
+      "ele"
     ]
   },
   "generalized_tables": {},
   "tables": {}
-}
+}

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

@@ -47,6 +47,11 @@
           "name": "network",
           "type": "string"
         },
+        {
+          "key": "network:wikidata",
+          "name": "network_wikidata",
+          "type": "string"
+        },
         {
           "key": "direction",
           "name": "direction",

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

@@ -47,6 +47,11 @@
           "name": "network",
           "type": "string"
         },
+        {
+          "key": "network:wikidata",
+          "name": "network_wikidata",
+          "type": "string"
+        },
         {
           "key": "direction",
           "name": "direction",

images/tiler-imposm/queries/ohm_mviews/routes_01_merge_by_date.sql

@@ -118,7 +118,7 @@ WITH union_sources AS (
   -- 1) From multi-lines (relations with members)
   SELECT
     member::bigint AS way_id,
-    osm_id, name, type, route, ref, network, operator, direction, tags, geometry,
+    osm_id, name, type, route, ref, network, network_wikidata, operator, direction, tags, geometry,
     start_decdate,
     end_decdate,
     me_highway AS highway
@@ -130,7 +130,7 @@ WITH union_sources AS (
   -- 2) From lines (direct way-based routes)
   SELECT
     osm_id::bigint AS way_id,
-    osm_id, name, type, route, ref, network, operator, direction, tags, geometry,
+    osm_id, name, type, route, ref, network, network_wikidata, operator, direction, tags, geometry,
     start_decdate,
     end_decdate,
     highway
@@ -160,6 +160,7 @@ data_for_null_dates AS (
         'ref', u.ref,
         'route', u.route,
         'network', u.network,
+        'network:wikidata', u.network_wikidata,
         'name', u.name,
         'type', u.type,
         'operator', u.operator,
@@ -200,7 +201,7 @@ data_for_dated_ways AS (
     -- Relate active routes to each time segment
     SELECT
       s.way_id, s.seg_start, s.seg_end,
-      u.osm_id, u.ref, u.route, u.network, u.name, u.type, u.operator, u.direction, u.tags, u.geometry, u.highway
+      u.osm_id, u.ref, u.route, u.network, u.network_wikidata, u.name, u.type, u.operator, u.direction, u.tags, u.geometry, u.highway
     FROM segments s
     JOIN union_sources u
       ON u.way_id = s.way_id
@@ -232,6 +233,7 @@ data_for_dated_ways AS (
           'ref', ref,
           'route', route,
           'network', network,
+          'network:wikidata', network_wikidata,
           'name', name,
           'type', type,
           'operator', operator,

images/tiler-imposm/scripts/setup_imposm_role.sh

@@ -16,12 +16,8 @@ BEGIN
 END
 \$\$;
 
--- Permissions
-GRANT ALL PRIVILEGES ON DATABASE $POSTGRES_DB TO imposm;
-GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO imposm;
-GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO imposm;
-ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON TABLES TO imposm;
-ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON SEQUENCES TO imposm;
+-- Grant superuser to imposm so it has full permissions like postgres
+ALTER ROLE imposm SUPERUSER;
 
 -- Session-level parameters (only apply to imposm connections, not Tegola)
 ALTER ROLE imposm IN DATABASE $POSTGRES_DB SET work_mem = '${IMPOSM_WORK_MEM:-1GB}';

images/web/Dockerfile

@@ -24,7 +24,7 @@ RUN apt-get update && \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Download OHM Website using gitsha, faster than cloning
-ENV OPENHISTORICALMAP_WEBSITE_GITSHA=a53c1384ce78e7ce3c41e410e9ec61315f0afa93
+ENV OPENHISTORICALMAP_WEBSITE_GITSHA=7ad2415aef444aa98775b1a5a8e4cd5124b7b8a5
 ENV OHM_WEBSITE_URL=https://github.com/OpenHistoricalMap/ohm-website/archive/${OPENHISTORICALMAP_WEBSITE_GITSHA}.zip
 RUN rm -rf $workdir/* && curl -fsSL $OHM_WEBSITE_URL -o /tmp/ohm-website.zip && \
     unzip /tmp/ohm-website.zip -d /tmp && \

values.production.template.yaml

@@ -870,7 +870,7 @@ osm-seed:
       UPDATE_MODE: continuous
       OSMSEED_WEB_API_DOMAIN: www.openhistoricalmap.org
       IMPORT_STYLE: extratags
-      EXTRA_TAGS: start_date,start_date:edtf,end_date,end_date:edt
+      EXTRA_TAGS: start_date,start_date:edtf,end_date,end_date:edtf
     resources:
       enabled: false
       requests: