[incubator-baremaps] branch main updated: Fix-workflow-database (#599)

[bc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git


The following commit(s) were added to refs/heads/main by this push:
     new 7102dfc5 Fix-workflow-database (#599)
7102dfc5 is described below

commit 7102dfc50306c6b01bd9446786e0550b8426cf07
Author: Zvika Rap <zv...@gmail.com>
AuthorDate: Wed Mar 15 17:11:30 2023 +0200

    Fix-workflow-database (#599)
    
    * fixed hardcoded workflow database to config.database
    
    * git ignore .vscode and basemap cache
    
    * move data.osm.pbf download url to config.js
---
 .gitignore          | 5 +++++
 basemap/config.js   | 1 +
 basemap/workflow.js | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4b76d7f8..e7c7dc84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,9 @@
 .idea/
 *.iml
 *.iws
+
+# vscode
+/.vscode/
  
 # Mac
 .DS_Store
@@ -16,6 +19,8 @@ examples/output/
 
 # Map
 /basemap/data/
+/basemap/cache_*/
+/basemap/local.*
 
 # JMH
 jmh-result.json
diff --git a/basemap/config.js b/basemap/config.js
index e0487484..b824787f 100644
--- a/basemap/config.js
+++ b/basemap/config.js
@@ -12,6 +12,7 @@
 export default {
     "host": "http://localhost:9000",
     "database": "jdbc:postgresql://localhost:5432/baremaps?&user=baremaps&password=baremaps",
+    "osmPbfUrl": "https://download.geofabrik.de/europe/switzerland-latest.osm.pbf",
     "center": [6.6323, 46.5197],
     "zoom": 14,
 }
diff --git a/basemap/workflow.js b/basemap/workflow.js
index b7aa7d00..ea7e5f56 100644
--- a/basemap/workflow.js
+++ b/basemap/workflow.js
@@ -174,7 +174,7 @@ export default {
         {
           "type": "ExecuteSql",
           "file": "queries/osm_water_index.sql",
-          "database": "jdbc:postgresql://localhost:5432/baremaps?&user=baremaps&password=baremaps"
+          "database": config.database
         }
       ]
     },
@@ -212,7 +212,7 @@ export default {
       "tasks": [
         {
           "type": "DownloadUrl",
-          "url": "https://download.geofabrik.de/europe/switzerland-latest.osm.pbf",
+          "url": config.osmPbfUrl,
           "path": "data/data.osm.pbf"
         },
         {