From 31629b94b8c4c65eed87a4c7692eee301df4a1e6 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 20 Aug 2024 12:05:15 +0200
Subject: [PATCH] Update scripts

---
 package.json                |  5 ++++-
 scripts/osm2pgsql/update.sh | 15 ++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 50d47a39e..86c1d0ce9 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,10 @@
     "server:studio": "vite-node scripts/studioServer -- /root/git/MapComplete/assets",
     "server:errorreport": "vite-node scripts/serverErrorReport.ts -- /root/error_reports/",
     "generate:buildDbScript": "vite-node scripts/osm2pgsql/generateBuildDbScript.ts",
-    "generate:summaryCache": "vite-node scripts/generateSummaryTileCache.ts"
+    "generate:summaryCache": "vite-node scripts/generateSummaryTileCache.ts",
+    "create:database": "vite-node scripts/osm2pgsql/createNewDatabase.ts",
+    "delete:database:old": "vite-node scripts/osm2pgsql/deleteOldDbs.ts"
+
   },
   "keywords": [
     "OpenStreetMap",
diff --git a/scripts/osm2pgsql/update.sh b/scripts/osm2pgsql/update.sh
index e78be3aa1..7b3532a80 100755
--- a/scripts/osm2pgsql/update.sh
+++ b/scripts/osm2pgsql/update.sh
@@ -1,15 +1,14 @@
 #! /bin/bash
 
 # Full database update. DOwnload latest from planet.osm.org, build update script, setup and seed it
-
-npm run init
-npm run generate
-npm run refresh:layeroverview
+nvm use
+npm run init # contains a 'npm run generate, which builds the layers'
 npm run generate:buildDbScript
-mv build_db.sh ~/data/
-TIMESTAMP=$(osmium fileinfo planet-latest.osm.pbf -g header.option.timestamp)
+mv build_db.lua ~/data/
+TIMESTAMP=$(osmium fileinfo ~/data/planet-latest.osm.pbf -g header.option.timestamp)
 DATE=$(echo $TIMESTAMP | sed "s/T.*//")
-vite-node scripts/osm2pgsql/createNewDatabase.ts -- ${DATE/T.*//}
+echo $DATE
+npm run create:database -- ${DATE/T.*//}
 
 cd ~/data || exit
 rm planet-latest.osm.pbf
@@ -21,6 +20,8 @@ nohup osm2pgsql -O flex -S build_db.lua -s --flat-nodes=import-help-file -d post
 # To see the progress
 # tail -f seeddb.log
 
+npm run delete:database:old
+
 # Restart tileserver
 export DATABASE_URL=postgresql://user:password@localhost:5444/osm-poi.${DATE}
 nohup ./pg_tileserv >> pg_tileserv.log &