Fix git history and merge conflicts with open-data fork

Change-type: patch Signed-off-by: zoobot <[email protected]>
waterthetrees · Nov 16, 2022 · ce53dac · ce53dac
1 parent 48bc4a8
commit ce53dac
Show file tree

Hide file tree

Showing 20 changed files with 7,357 additions and 4,256 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+18
diff --git a/README.md b/README.md
@@ -39,6 +39,7 @@ npm run download # downloads all of the source data
 npm run convert # converts all source data into newline delimited GeoJSON
 npm run normalize # normalizes all the converted files
 npm run concatenate # smashes all the normalized files together
+npm run save # saves to the db
 npm run tile # builds a vector tile set from the concatenated file
 ```
 

diff --git a/db/db-config.js b/db/db-config.js
diff --git a/db/index.js b/db/index.js
diff --git a/db/pg-promise-config.js b/db/pg-promise-config.js
diff --git a/identity-crosswalk.js b/identity-crosswalk.js
diff --git a/models/models_area.js b/models/models_area.js