add postgres-execute estimation

move tutorial to wiki disable map-rotation add generalized water layer
henrythasler · Sep 14, 2019 · 4549413 · 4549413
1 parent 0e0fb4b
commit 4549413
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 34 deletions.
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -77,11 +77,13 @@ SELECT ( [${layer1} [|| ${layer2} [|| ...]] ) as data
 
 - ~~Move database to [Serverless Aurora PostgreSQL](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.how-it-works.html) to reduce monthly costs.~~ Won't do. Resume after pause is 30s+ and keeping 2 ACUs hot at all times is too expensive.
 - ~~Evaluate [Data API for Aurora Serverless](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html).~~ Won't do. See above. According to [this review](https://www.jeremydaly.com/aurora-serverless-data-api-a-first-look/), performance also seems bad compared to API-calls.
+- move terraform-state to s3-bucket.
 - Security-Review for Lambda-Code (e.g. SQL-Injection, ...)
 - Change all scripts to use Postgres environment variables (PGUSER, ...)
 - Omit Postgres credentials altogether and use IAM-role instead
 - move lambda-function out of VPC to reduce cold-start-time
 - Add raster endpoint with node-mapbox-gl-native to serve pre-rendered raster-images.
+- Check how blue-green deployments could be realized with API Gateway and Lambda.
 
 ## References
 

diff --git a/README.md b/README.md
@@ -4,8 +4,6 @@
 
 Serve mapbox vectortiles via AWS stack.
 
-**THIS README IS WORK-IN-PROGRESS**
-
 ## Goals
 
 These are the main project goals:
@@ -33,6 +31,8 @@ Checked items are already fulfilled.
 
 ![](docs/img/CloudFront-tiles-simple.png)
 
+A more detailled description can be found in [DEVELOPMENT.md](DEVELOPMENT.md)
+
 ## Screenshots, Live Demo
 
 The Live-Demo is available at: [cyclemap.link](https://cyclemap.link)
@@ -73,7 +73,3 @@ extend | `number` | tile extent in pixels (see [ST_AsMVTGeom](https://postgis.ne
 buffer | `number` | buffer in pixels around each tile (see [ST_AsMVTGeom](https://postgis.net/docs/manual-dev/ST_AsMVTGeom.html)) | `256`
 clip_geom | `boolean` | clip geometries that lie outside the current tile incl. buffer (see [ST_AsMVTGeom](https://postgis.net/docs/manual-dev/ST_AsMVTGeom.html)) | `true`
 
-
-## Software Design, Implementation Details
-
-A more detailled description can be found in [DEVELOPMENT.md](DEVELOPMENT.md)
diff --git a/TUTORIAL.md b/TUTORIAL.md
diff --git a/docs/stack.odg b/docs/stack.odg
diff --git a/html/index.html b/html/index.html
@@ -152,6 +152,9 @@
             })
             );
 
+            // disable map rotation using touch rotation gesture
+            map.touchZoomRotate.disableRotation();
+
             // Debug output
             map.showTileBoundaries = true;
             // map.showCollisionBoxes = true;

diff --git a/src/sources.json b/src/sources.json
@@ -5,10 +5,26 @@
       "database": "shapes",
       "layers": [
         {
-          "minzoom": 7,
+          "minzoom": 3,
           "name": "water",
-          "table": "public.simplified_water_polygons",
+          "table": "public.water_gen3",
           "variants": [
+            {
+              "minzoom": 4,
+              "table": "public.water_gen4"
+            },
+            {
+              "minzoom": 5,
+              "table": "public.water_gen5"
+            },
+            {
+              "minzoom": 6,
+              "table": "public.water_gen6"
+            },
+            {
+              "minzoom": 7,
+              "table": "public.simplified_water_polygons"
+            },
             {
               "minzoom": 8,
               "table": "public.water_polygons"
@@ -26,7 +42,7 @@
           "variants": [
             {
               "minzoom": 4,
-              "table": "public.bathymetry_gen3"
+              "table": "public.bathymetry_gen4"
             },
             {
               "minzoom": 5,

diff --git a/src/sources.toml b/src/sources.toml
@@ -3,9 +3,21 @@
   database = "shapes"
 
   [[sources.layers]]
-    minzoom   = 7
+    minzoom   = 3
     name      = "water"
-    table     = "public.simplified_water_polygons"
+    table     = "public.water_gen3"
+  [[sources.layers.variants]]
+      minzoom = 4
+      table   = "public.water_gen4"
+  [[sources.layers.variants]]
+      minzoom = 5
+      table   = "public.water_gen5"
+  [[sources.layers.variants]]
+      minzoom = 6
+      table   = "public.water_gen6"
+  [[sources.layers.variants]]
+      minzoom = 7
+      table   = "public.simplified_water_polygons"
   [[sources.layers.variants]]
       minzoom = 8
       table   = "public.water_polygons"
@@ -18,7 +30,7 @@
     postfix   = "ORDER BY depth"
   [[sources.layers.variants]]
       minzoom = 4
-      table   = "public.bathymetry_gen3"
+      table   = "public.bathymetry_gen4"
   [[sources.layers.variants]]
       minzoom = 5
       table   = "public.bathymetry"

diff --git a/tsconfig.json b/tsconfig.json
@@ -58,7 +58,7 @@
     /* Experimental Options */
     // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
-    "resolveJsonModule": true,
+    "resolveJsonModule": true
   },
   "include": [
     "src/**/*.ts"