Adjust Simplification in tiler.

Update config to use var envs files

Set  --acl public-read for rapid bucket files

Remove deployment rapid in branch deploy/rapid

Update helm deployment for staging and production

.github/workflows/chartpress.yaml

@@ -1,5 +1,9 @@
 name: Chartpress Publish and Deploy
-on: push
+on:
+  push:
+    branches:
+      - 'main'
+      - 'staging'
 jobs:
   build:
     runs-on: ubuntu-20.04

.github/workflows/frontend-rapid.yaml

@@ -4,7 +4,6 @@ on:
     branches:
       - 'main'
       - 'staging'
-      - 'deploy/rapid'
 jobs:
   rapid:
     runs-on: ubuntu-latest
@@ -14,7 +13,7 @@ jobs:
         with:
           access_token: ${{ github.token }}
       - name: Set environment variables - Staging
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/deploy/rapid'
+        if: github.ref == 'refs/heads/staging'
         uses: allenevans/[email protected]
         with:
           RAPID_BUCKET: rapid-staging.openhistoricalmap.org
@@ -84,7 +83,7 @@ jobs:
       - name: Push data to s3 and clean cloudfront cache
         if: ${{ success() }}
         run: |
-          aws s3 sync dist/ s3://${RAPID_BUCKET}/
+          aws s3 sync dist/ s3://${RAPID_BUCKET}/  --acl public-read
           aws cloudfront create-invalidation --distribution-id=${CLOUDFRONT_DISTRIBUTION_ID} --paths=/
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.gitignore

@@ -9,4 +9,6 @@ images/.env
 images/tiler.yml
 values.dev.yaml
 secrets
-tegola
+tegola
+envs/.env.tiler
+envs/.env.web

compose/tiler.yml

@@ -11,5 +11,5 @@ services:
     ports:
       - "9090:9090"
     env_file:
-      - ../envs/.env.tiler.example
+      - ../envs/.env.tiler
     restart: always

compose/web.yml

@@ -11,7 +11,7 @@ services:
     volumes:
       - ./data/db-data:/var/lib/postgresql/data
     env_file:
-      - ./.env.web.example
+      - ./.env.web
   web:
     image: osmseed-web:v1
     build:
@@ -20,7 +20,7 @@ services:
     ports:
       - '80:80'
     env_file:
-      - ./.env.web.example
+      - ./.env.web
     ####### Enable for development mode
     # volumes:
     #   - ./../../ohm-website:/var/www

images/tiler-server/config/config.toml

@@ -36,35 +36,35 @@ max_connections = 40
 	geometry_fieldname = "geometry"
 	geometry_type = "multipolygon"
 	id_fieldname = "ogc_fid"
-	sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 750),!BBOX!) AS geometry, ogc_fid FROM land_polygons WHERE wkb_geometry && !BBOX!"
+	sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 500),!BBOX!) AS geometry, ogc_fid FROM land_polygons WHERE wkb_geometry && !BBOX!"
 
 	[[providers.layers]]
 	name = "land_3-5"
 	geometry_fieldname = "geometry"
 	geometry_type = "multipolygon"
 	id_fieldname = "ogc_fid"
-	sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 300),!BBOX!) AS geometry, ogc_fid FROM land_polygons WHERE wkb_geometry && !BBOX!"
+	sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 200),!BBOX!) AS geometry, ogc_fid FROM land_polygons WHERE wkb_geometry && !BBOX!"
 
 	[[providers.layers]]
 	name = "land_6-7"
 	geometry_fieldname = "geometry"
 	geometry_type = "multipolygon"
 	id_fieldname = "ogc_fid"
-	sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 150),!BBOX!) AS geometry, ogc_fid FROM land_polygons WHERE wkb_geometry && !BBOX!"
+	sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 70),!BBOX!) AS geometry, ogc_fid FROM land_polygons WHERE wkb_geometry && !BBOX!"
 
 	[[providers.layers]]
 	name = "land_8-9"
 	geometry_fieldname = "geometry"
 	geometry_type = "multipolygon"
 	id_fieldname = "ogc_fid"
-	sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 75),!BBOX!) AS geometry, ogc_fid FROM land_polygons WHERE wkb_geometry && !BBOX!"
+	sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 30),!BBOX!) AS geometry, ogc_fid FROM land_polygons WHERE wkb_geometry && !BBOX!"
 
 	[[providers.layers]]
 	name = "land_10-12"
 	geometry_fieldname = "geometry"
 	geometry_type = "multipolygon"
 	id_fieldname = "ogc_fid"
-	sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 30),!BBOX!) AS geometry, ogc_fid FROM land_polygons WHERE wkb_geometry && !BBOX!"
+	sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 10),!BBOX!) AS geometry, ogc_fid FROM land_polygons WHERE wkb_geometry && !BBOX!"
 
 	[[providers.layers]]
 	name = "land_13-15"