Skip to content
This repository has been archived by the owner on Aug 1, 2024. It is now read-only.

Commit

Permalink
layer-geodata-without-geojson (#105)
Browse files Browse the repository at this point in the history
* updated initial-load with option to store geodata without geojson, they might be added later to new collection
  • Loading branch information
MartinJurcoGlina authored Feb 17, 2022
1 parent 7752218 commit 3a51b05
Show file tree
Hide file tree
Showing 7 changed files with 1,570 additions and 1,400 deletions.
4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.54",
"@material-ui/styles": "^4.10.0",
"axios": "^0.21.2",
"axios": "^0.26.0",
"colormap": "^2.3.0",
"html2canvas": "^1.3.2",
"http-proxy-middleware": "^1.0.3",
Expand Down Expand Up @@ -60,7 +60,7 @@
"eslint-plugin-react-hooks": "^4.0.8",
"husky": "^4.2.5",
"prettier": "^2.2.1",
"react-scripts": "5.0.0"
"react-scripts": "^5.0.0"
},
"husky": {
"hooks": {
Expand Down
2,432 changes: 1,276 additions & 1,156 deletions frontend/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion initial-data-load/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@azure/storage-queue": "^12.2.0",
"@hapi/joi": "^17.1.1",
"@turf/bbox": "^6.5.0",
"axios": "^0.21.2",
"axios": "^0.26.0",
"azure-storage": "^2.10.3",
"bottleneck": "^2.19.5",
"csvtojson": "^2.0.10",
Expand Down
4 changes: 4 additions & 0 deletions initial-data-load/src/mapLayers/layersGeoDataUpload.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ const formatLayerGeoData = async (data, country) => {
return false;
}
let url;
if (data.collectionName && data.apiUrl) {
await createGeoDataIndex(data.collectionName);
url = data.apiUrl;
}
if (data.geoDataUrl) {
logger.info(`Downloading geojson ${data.geoDataUrl} for layer ${data.referenceId}...`);
if (data.storeToDb) {
Expand Down
252 changes: 136 additions & 116 deletions initial-data-load/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion url-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "index.js",
"dependencies": {
"@hapi/joi": "^17.1.1",
"axios": "^0.21.2",
"axios": "^0.26.0",
"azure-storage": "^2.10.1",
"bottleneck": "^2.19.5",
"dotenv": "^6.0.0",
Expand Down
274 changes: 150 additions & 124 deletions url-loader/yarn.lock

Large diffs are not rendered by default.

0 comments on commit 3a51b05

Please sign in to comment.