Porting fixes from stale branch

assets/themes/grb.json

@@ -101,7 +101,7 @@
             {
               "if": {
                 "and": [
-                  "addr:housenumber:=",
+                  "addr:housenumber=",
                   "not:addr:housenumber=yes",
                   "fixme="
                 ]

scripts/ScriptUtils.ts

@@ -1,5 +1,6 @@
 import {lstatSync, readdirSync, readFileSync} from "fs";
 import {Utils} from "../Utils";
+
 Utils.runningFromConsole = true
 import * as https from "https";
 import * as fs from "fs";
@@ -107,6 +108,7 @@ export default class ScriptUtils {
     public static getLayerFiles(): { parsed: LayerConfigJson, path: string }[] {
         return ScriptUtils.readDirRecSync("./assets/layers")
             .filter(path => path.indexOf(".json") > 0)
+            .filter(path => path.indexOf(".proto.json") < 0)
             .filter(path => path.indexOf("license_info.json") < 0)
             .map(path => {
                 try {

scripts/generateLayerOverview.ts

@@ -25,6 +25,9 @@ class LayerOverviewUtils {
         const themeFiles: LayoutConfigJson[] = ScriptUtils.getThemeFiles().map(x => x.parsed);
 
         console.log("Discovered", layerFiles.length, "layers and", themeFiles.length, "themes\n")
+        if (layerFiles.length + themeFiles.length === 0) {
+            throw "Panic: no themes and layers loaded!"
+        }
         return {
             layers: layerFiles,
             themes: themeFiles

scripts/generateTranslations.ts

@@ -235,7 +235,7 @@ function MergeTranslation(source: any, target: any, language: string, context: s
             }
 
             if (typeof targetV === "string") {
-                throw `At context ${context}: Could not add a translation. The target object has a string at the given path, whereas the translation contains an object.\n    String at target: ${targetV}\n    Object at translation source: ${JSON.stringify(sourceV)}`
+                throw `At context ${context}: Could not add a translation in language ${language}. The target object has a string at the given path, whereas the translation contains an object.\n    String at target: ${targetV}\n    Object at translation source: ${JSON.stringify(sourceV)}`
             }
 
             targetV[language] = sourceV;