From a0c58434d142ff15038b5758cb1d6f77a0a9429d Mon Sep 17 00:00:00 2001
From: lathoub <4082369+lathoub@users.noreply.github.com>
Date: Sat, 14 Sep 2024 11:29:00 +0200
Subject: [PATCH] reorg data folder

---
 .DS_Store                                     | Bin 8196 -> 6148 bytes
 data/{ => datasets}/NAPPeilmerken.geojson     |   0
 data/{ => datasets}/NAPPeilmerken.yml         |   0
 data/{ => datasets}/buurten.geojson           |   0
 data/{ => datasets}/buurten.yml               |   0
 data/{ => datasets}/energielabels.geojson     |   0
 data/{ => datasets}/energielabels.yml         |   0
 data/{ => datasets}/gemeenteGrens.geojson     |   0
 data/{ => datasets}/gemeentegrens.yml         |   0
 .../kamersgewijzeVerhuur.geojson              |   0
 data/{ => datasets}/kamersgewijzeVerhuur.yml  |   0
 data/{ => datasets}/zonnepanelen.geojson      |   0
 data/{ => datasets}/zonnepanelen.yml          |   0
 {processen => data/processes}/addNumbers.json |   0
 .../processes}/addNumbers/add.sh              |   0
 .../processes}/addNumbers/launch.js           |   0
 .../processes}/countFeatures.json             |   0
 .../processes}/countFeatures/count.js         |   0
 .../processes}/countFeatures/launch.js        |   0
 .../processes}/echoService.json               |   0
 .../processes}/echoService/docker-compose.yml |   0
 .../processes}/echoService/launch.js          |   0
 package.json                                  |  11 +----------
 src/index.js                                  |   4 ++--
 24 files changed, 3 insertions(+), 12 deletions(-)
 rename data/{ => datasets}/NAPPeilmerken.geojson (100%)
 rename data/{ => datasets}/NAPPeilmerken.yml (100%)
 rename data/{ => datasets}/buurten.geojson (100%)
 rename data/{ => datasets}/buurten.yml (100%)
 rename data/{ => datasets}/energielabels.geojson (100%)
 rename data/{ => datasets}/energielabels.yml (100%)
 rename data/{ => datasets}/gemeenteGrens.geojson (100%)
 rename data/{ => datasets}/gemeentegrens.yml (100%)
 rename data/{ => datasets}/kamersgewijzeVerhuur.geojson (100%)
 rename data/{ => datasets}/kamersgewijzeVerhuur.yml (100%)
 rename data/{ => datasets}/zonnepanelen.geojson (100%)
 rename data/{ => datasets}/zonnepanelen.yml (100%)
 rename {processen => data/processes}/addNumbers.json (100%)
 rename {processen => data/processes}/addNumbers/add.sh (100%)
 rename {processen => data/processes}/addNumbers/launch.js (100%)
 rename {processen => data/processes}/countFeatures.json (100%)
 rename {processen => data/processes}/countFeatures/count.js (100%)
 rename {processen => data/processes}/countFeatures/launch.js (100%)
 rename {processen => data/processes}/echoService.json (100%)
 rename {processen => data/processes}/echoService/docker-compose.yml (100%)
 rename {processen => data/processes}/echoService/launch.js (100%)

diff --git a/.DS_Store b/.DS_Store
index 3aec92339defb105c6378f6f48af7a442922541d..bf17ed4ce8f6af07c20e64016244f9781f4e3d8c 100644
GIT binary patch
delta 128
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50D9Q(t2Z?#+<R>TP<R^g?Y%E;P
z%*eMnP=K9j@)F_ZjSYp2i`h9i1et-7AbD;e;R-TjW8rt^$^0^&AR`%=AjX4iWY`?f
HGlv-fYv2_u

delta 527
zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aKKDgu%R@);O18PYv-@{^Nt@{=|T
za)_~PR^aGmUd+zHF|mQg4Wx{XA(<hcA&(&qSt-aYpb0;LwBCO(0J6~3rW7aVB<1Jl
zFl^>wVP~o@U?>8blgyCHPz;2r40$kXf%<@EF{}rg$A@GVCj*9#r1IhdkVAp0w<i_k
zWEPhg7+hmyVrF4wW9MM!;O2-8&d4thE=epYEp|#QiU#pQfG$V^vg^T|#H6sy)be-%
z5$F88lElos)FQBs%#>81nwap+yp;TMr~J~qlwz>vV2A_<CkJP|fOvJarJ;$Af~9e-
zjzYDik%5kag_%KZEhmSlvc7dte0EN5UVbOgZ9u>X3|uhah0+Y3P(~M!#^N=2U}2Xo
z3ogpb$<Ip%$}&#oW9!(g&hwm^OM)B7cLhZ&FzUWDPv#f#ob1oT!2z@!6ypq=<9X&V
F0|3kBfSv#V

diff --git a/data/NAPPeilmerken.geojson b/data/datasets/NAPPeilmerken.geojson
similarity index 100%
rename from data/NAPPeilmerken.geojson
rename to data/datasets/NAPPeilmerken.geojson
diff --git a/data/NAPPeilmerken.yml b/data/datasets/NAPPeilmerken.yml
similarity index 100%
rename from data/NAPPeilmerken.yml
rename to data/datasets/NAPPeilmerken.yml
diff --git a/data/buurten.geojson b/data/datasets/buurten.geojson
similarity index 100%
rename from data/buurten.geojson
rename to data/datasets/buurten.geojson
diff --git a/data/buurten.yml b/data/datasets/buurten.yml
similarity index 100%
rename from data/buurten.yml
rename to data/datasets/buurten.yml
diff --git a/data/energielabels.geojson b/data/datasets/energielabels.geojson
similarity index 100%
rename from data/energielabels.geojson
rename to data/datasets/energielabels.geojson
diff --git a/data/energielabels.yml b/data/datasets/energielabels.yml
similarity index 100%
rename from data/energielabels.yml
rename to data/datasets/energielabels.yml
diff --git a/data/gemeenteGrens.geojson b/data/datasets/gemeenteGrens.geojson
similarity index 100%
rename from data/gemeenteGrens.geojson
rename to data/datasets/gemeenteGrens.geojson
diff --git a/data/gemeentegrens.yml b/data/datasets/gemeentegrens.yml
similarity index 100%
rename from data/gemeentegrens.yml
rename to data/datasets/gemeentegrens.yml
diff --git a/data/kamersgewijzeVerhuur.geojson b/data/datasets/kamersgewijzeVerhuur.geojson
similarity index 100%
rename from data/kamersgewijzeVerhuur.geojson
rename to data/datasets/kamersgewijzeVerhuur.geojson
diff --git a/data/kamersgewijzeVerhuur.yml b/data/datasets/kamersgewijzeVerhuur.yml
similarity index 100%
rename from data/kamersgewijzeVerhuur.yml
rename to data/datasets/kamersgewijzeVerhuur.yml
diff --git a/data/zonnepanelen.geojson b/data/datasets/zonnepanelen.geojson
similarity index 100%
rename from data/zonnepanelen.geojson
rename to data/datasets/zonnepanelen.geojson
diff --git a/data/zonnepanelen.yml b/data/datasets/zonnepanelen.yml
similarity index 100%
rename from data/zonnepanelen.yml
rename to data/datasets/zonnepanelen.yml
diff --git a/processen/addNumbers.json b/data/processes/addNumbers.json
similarity index 100%
rename from processen/addNumbers.json
rename to data/processes/addNumbers.json
diff --git a/processen/addNumbers/add.sh b/data/processes/addNumbers/add.sh
similarity index 100%
rename from processen/addNumbers/add.sh
rename to data/processes/addNumbers/add.sh
diff --git a/processen/addNumbers/launch.js b/data/processes/addNumbers/launch.js
similarity index 100%
rename from processen/addNumbers/launch.js
rename to data/processes/addNumbers/launch.js
diff --git a/processen/countFeatures.json b/data/processes/countFeatures.json
similarity index 100%
rename from processen/countFeatures.json
rename to data/processes/countFeatures.json
diff --git a/processen/countFeatures/count.js b/data/processes/countFeatures/count.js
similarity index 100%
rename from processen/countFeatures/count.js
rename to data/processes/countFeatures/count.js
diff --git a/processen/countFeatures/launch.js b/data/processes/countFeatures/launch.js
similarity index 100%
rename from processen/countFeatures/launch.js
rename to data/processes/countFeatures/launch.js
diff --git a/processen/echoService.json b/data/processes/echoService.json
similarity index 100%
rename from processen/echoService.json
rename to data/processes/echoService.json
diff --git a/processen/echoService/docker-compose.yml b/data/processes/echoService/docker-compose.yml
similarity index 100%
rename from processen/echoService/docker-compose.yml
rename to data/processes/echoService/docker-compose.yml
diff --git a/processen/echoService/launch.js b/data/processes/echoService/launch.js
similarity index 100%
rename from processen/echoService/launch.js
rename to data/processes/echoService/launch.js
diff --git a/package.json b/package.json
index 70b34d2..58bcba3 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,4 @@
 {
-  "name": "step19",
-  "description": "",
-  "version": "1.0.0",
-  "main": "index.js",
-  "author": "",
-  "license": "ISC",
   "type": "module",
   "dependencies": {
     "@turf/turf": "^7.0.0",
@@ -12,15 +6,12 @@
     "cors": "^2.8.5",
     "debug": "^4.3.5",
     "docker-cli-js": "^2.10.0",
-    "docker-compose": "^0.24.8",
-    "express": "^4.20.0",
-    "jsonpath-plus": "^9.0.0",
+    "express": "^4.21.0",
     "morgan": "^1.10.0",
     "proj4": "^2.11.0",
     "pug": "^3.0.3",
     "semver": "^7.6.3",
     "serve-favicon": "^2.5.0",
-    "swagger-ui-express": "^5.0.1",
     "url-join": "^5.0.0",
     "yaml": "^2.5.0"
   }
diff --git a/src/index.js b/src/index.js
index 9866142..756f330 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,9 +8,9 @@ if (__dirname === undefined) console.log("need node 20.16 or higher");
 
 // Load data (TODO: async)
 try {
-  var dataPath = join(process.env.DATA_PATH || __dirname, "../data");
+  var dataPath = join(process.env.DATA_PATH || __dirname, "../data/datasets");
   readData(dataPath);
-  var processenPath = join(process.env.DATA_PATH || __dirname, "../processen");
+  var processenPath = join(process.env.DATA_PATH || __dirname, "../data/processes");
   readProcesses(processenPath);
 } catch (err) {
   console.log(err);