refactoring(maplibre): WIP

Models/ThemeConfig/Conversion/PrepareLayer.ts

@@ -23,8 +23,6 @@ import predifined_filters from "../../../assets/layers/filters/filters.json"
 import { TagConfigJson } from "../Json/TagConfigJson"
 import PointRenderingConfigJson from "../Json/PointRenderingConfigJson"
 import LineRenderingConfigJson from "../Json/LineRenderingConfigJson"
-import { type } from "os"
-import exp from "constants"
 
 class ExpandFilter extends DesugaringStep<LayerConfigJson> {
     private static readonly predefinedFilters = ExpandFilter.load_filters()

Models/ThemeConfig/Conversion/PrepareTheme.ts

@@ -175,7 +175,7 @@ class SubstituteLayer extends Conversion<string | LayerConfigJson, LayerConfigJs
 }
 
 class AddDefaultLayers extends DesugaringStep<LayoutConfigJson> {
-    private _state: DesugaringContext
+    private readonly _state: DesugaringContext
 
     constructor(state: DesugaringContext) {
         super(
@@ -430,7 +430,7 @@ class AddDependencyLayersToTheme extends DesugaringStep<LayoutConfigJson> {
     constructor(state: DesugaringContext) {
         super(
             `If a layer has a dependency on another layer, these layers are added automatically on the theme. (For example: defibrillator depends on 'walls_and_buildings' to snap onto. This layer is added automatically)
-            
+
             Note that these layers are added _at the start_ of the layer list, meaning that they will see _every_ feature.
             Furthermore, \`passAllFeatures\` will be set, so that they won't steal away features from further layers.
             Some layers (e.g. \`all_buildings_and_walls\' or \'streets_with_a_name\') are invisible, so by default, \'force_load\' is set too.

Models/ThemeConfig/Conversion/Validation.ts

@@ -15,6 +15,7 @@ import Svg from "../../../Svg"
 import FilterConfigJson from "../Json/FilterConfigJson"
 import DeleteConfig from "../DeleteConfig"
 import { QuestionableTagRenderingConfigJson } from "../Json/QuestionableTagRenderingConfigJson"
+import ValidatedTextField from "../../../UI/Input/ValidatedTextField"
 
 class ValidateLanguageCompleteness extends DesugaringStep<any> {
     private readonly _languages: string[]
@@ -594,6 +595,7 @@ export class DetectMappingsWithImages extends DesugaringStep<TagRenderingConfigJ
 
 class MiscTagRenderingChecks extends DesugaringStep<TagRenderingConfigJson> {
     private _options: { noQuestionHintCheck: boolean }
+
     constructor(options: { noQuestionHintCheck: boolean }) {
         super("Miscellaneous checks on the tagrendering", ["special"], "MiscTagRenderingChecks")
         this._options = options
@@ -637,6 +639,19 @@ class MiscTagRenderingChecks extends DesugaringStep<TagRenderingConfigJson> {
                 }
             }
         }
+        const freeformType = json["freeform"]?.["type"]
+        if (freeformType) {
+            if (ValidatedTextField.AvailableTypes().indexOf(freeformType) < 0) {
+                throw (
+                    "At " +
+                    context +
+                    ".freeform.type is an unknown type: " +
+                    freeformType +
+                    "; try one of " +
+                    ValidatedTextField.AvailableTypes().join(", ")
+                )
+            }
+        }
         return {
             result: json,
             errors,
@@ -905,6 +920,38 @@ export class ValidateLayer extends DesugaringStep<LayerConfigJson> {
     }
 }
 
+export class ValidateFilter extends DesugaringStep<FilterConfigJson> {
+    constructor() {
+        super("Detect common errors in the filters", [], "ValidateFilter")
+    }
+
+    convert(
+        filter: FilterConfigJson,
+        context: string
+    ): {
+        result: FilterConfigJson
+        errors?: string[]
+        warnings?: string[]
+        information?: string[]
+    } {
+        const errors = []
+        for (const option of filter.options) {
+            for (let i = 0; i < option.fields.length; i++) {
+                const field = option.fields[i]
+                const type = field.type ?? "string"
+                if (!ValidatedTextField.ForType(type) !== undefined) {
+                    continue
+                }
+                const err = `Invalid filter: ${type} is not a valid validated textfield type (at ${context}.fields[${i}])\n\tTry one of ${Array.from(
+                    ValidatedTextField.AvailableTypes()
+                ).join(",")}`
+                errors.push(err)
+            }
+        }
+        return { result: filter, errors }
+    }
+}
+
 export class DetectDuplicateFilters extends DesugaringStep<{
     layers: LayerConfigJson[]
     themes: LayoutConfigJson[]