Merge develop

src/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts

@@ -41,7 +41,6 @@ export class UpdateLegacyLayer extends DesugaringStep<
                 delete preset["preciseInput"]
             } else if (preciseInput !== undefined) {
                 delete preciseInput["preferredBackground"]
-                console.log("Precise input:", preciseInput)
                 preset.snapToLayer = preciseInput.snapToLayer
                 delete preciseInput.snapToLayer
                 if (preciseInput.maxSnapDistance) {
@@ -232,6 +231,10 @@ class UpdateLegacyTheme extends DesugaringStep<LayoutConfigJson> {
             delete oldThemeConfig.socialImage
         }
 
+        if (oldThemeConfig.defaultBackgroundId === "osm") {
+            console.log("Removing old background in", json.id)
+        }
+
         if (oldThemeConfig["roamingRenderings"] !== undefined) {
             if (oldThemeConfig["roamingRenderings"].length == 0) {
                 delete oldThemeConfig["roamingRenderings"]

src/Models/ThemeConfig/LayerConfig.ts

@@ -203,12 +203,6 @@ export default class LayerConfig extends WithContextLoader {
                 }
                 const code = kv.substring(index + 1)
 
-                try {
-                    new Function("feat", "return " + code + ";")
-                } catch (e) {
-                    throw `Invalid function definition: the custom javascript is invalid:${e} (at ${context}). The offending javascript code is:\n    ${code}`
-                }
-
                 this.calculatedTags.push([key, code, isStrict])
             }
         }
@@ -357,7 +351,7 @@ export default class LayerConfig extends WithContextLoader {
         }
 
         {
-            const duplicateIds = Utils.Dupiclates(this.filters.map((f) => f.id))
+            const duplicateIds = Utils.Duplicates(this.filters.map((f) => f.id))
             if (duplicateIds.length > 0) {
                 throw `Some filters have a duplicate id: ${duplicateIds} (at ${context}.filters)`
             }

src/Models/ThemeConfig/TagRenderingConfig.ts

@@ -652,6 +652,16 @@ export default class TagRenderingConfig {
     /**
      * Given a value for the freeform key and an overview of the selected mappings, construct the correct tagsFilter to apply
      *
+     * const config = new TagRenderingConfig({"id":"bookcase-booktypes","render":{"en":"This place mostly serves {books}" },
+     * "question":{"en":"What kind of books can be found in this public bookcase?"},
+     * "freeform":{"key":"books","addExtraTags":["fixme=Freeform tag `books` used, to be doublechecked"],
+     * "inline":true},
+     * "multiAnswer":true,
+     * "mappings":[{"if":"books=children","then":"Mostly children books"},
+     * {"if":"books=adults","then": "Mostly books for adults"}]}
+     * , "testcase")
+     * config.constructChangeSpecification(undefined, undefined, [false, true, false], {amenity: "public_bookcase"}) // => new And([new Tag("books","adults")])
+     *
      * @param freeformValue The freeform value which will be applied as 'freeform.key'. Ignored if 'freeform.key' is not set
      *
      * @param singleSelectedMapping (Only used if multiAnswer == false): the single mapping to apply. Use (mappings.length) for the freeform