Merge branch 'main' into new-scenario-on-upload

OurPlanscape · Aug 20, 2024 · f8d7677 · f8d7677
2 parents 8c2e8c2 + 6c9660d
commit f8d7677
Show file tree

Hide file tree

Showing 59 changed files with 1,508 additions and 419 deletions.
diff --git a/.github/workflows/angular.yaml b/.github/workflows/angular.yaml
@@ -25,7 +25,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
-      - run: npm ci
+      - run: npm ci --legacy-peer-deps
       - run: npm run lint
 
   build:
@@ -47,7 +47,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
-      - run: npm ci
+      - run: npm ci --legacy-peer-deps
       - run: npm run test:prod
 
   storybook:
@@ -67,5 +67,5 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
-      - run: npm ci
+      - run: npm ci --legacy-peer-deps
       - run: npm run build-storybook
diff --git a/Makefile b/Makefile
@@ -46,7 +46,7 @@ taggit:
 	echo "Completed taggit"
 
 install-dependencies-frontend:
-	cd src/interface && npm install
+	cd src/interface && npm install --legacy-peer-deps
 
 compile-angular:
 	cd src/interface && npm run build -- --configuration production --output-path=./dist/out

diff --git a/src/interface/angular.json b/src/interface/angular.json
@@ -34,6 +34,7 @@
             "styles": [
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
               "./node_modules/leaflet/dist/leaflet.css",
+              "./node_modules/maplibre-gl/dist/maplibre-gl.css",
               "src/styles.scss"
             ],
             "stylePreprocessorOptions": {