Merge branch 'develop' into feature/360-view

scripts/Script.ts

@@ -24,7 +24,7 @@ export default abstract class Script {
             })
             .catch((e) => {
                 console.log(`ERROR in script ${process.argv[1]}:`, e)
-                // process.exit(1)
+                process.exit(1)
             })
     }
 

scripts/generateLayerOverview.ts

@@ -9,16 +9,12 @@ import {
     DoesImageExist,
     PrevalidateTheme,
     ValidateLayer,
-    ValidateThemeEnsemble,
+    ValidateThemeEnsemble
 } from "../src/Models/ThemeConfig/Conversion/Validation"
 import { Translation } from "../src/UI/i18n/Translation"
 import { PrepareLayer } from "../src/Models/ThemeConfig/Conversion/PrepareLayer"
 import { PrepareTheme } from "../src/Models/ThemeConfig/Conversion/PrepareTheme"
-import {
-    Conversion,
-    DesugaringContext,
-    DesugaringStep,
-} from "../src/Models/ThemeConfig/Conversion/Conversion"
+import { Conversion, DesugaringContext, DesugaringStep } from "../src/Models/ThemeConfig/Conversion/Conversion"
 import { Utils } from "../src/Utils"
 import Script from "./Script"
 import { AllSharedLayers } from "../src/Customizations/AllSharedLayers"
@@ -654,6 +650,9 @@ class LayerOverviewUtils extends Script {
             if (sharedLayers.has(fixed.id)) {
                 throw "There are multiple layers with the id " + fixed.id + ", " + sharedLayerPath
             }
+            if (parsed.context.hasErrors()) {
+                throw "Some layers contain errors"
+            }
 
             sharedLayers.set(fixed.id, fixed)
             recompiledLayers.push(fixed.id)

scripts/prepare-build.sh

@@ -20,9 +20,8 @@ npm run download:editor-layer-index &&
 npm run prep:layeroverview &&
 npm run generate && # includes a single "refresh:layeroverview". Resetting the files is unnecessary as they are not in there in the first place
 npm run generate:mapcomplete-changes-theme  &&
-npm run refresh:layeroverview && # run refresh:layeroverview a second time to propagate all calls
-npm run generate:layeroverview &&  # run refresh:layeroverview a third time to fix some issues with the favourite layer all calls
-
+npm run refresh:layeroverview && #  a second time to propagate all calls
+npm run refresh:layeroverview &&  # a third time to fix some issues with the favourite layer all calls
 npm run generate:layouts
 
 if [ $? -ne 0 ]; then