Formatting

Logic/Tags/And.ts

@@ -244,8 +244,8 @@ export class And extends TagsFilter {
                 }
             }
 
-            for (let i = 0; i < optimized.length; i++){
+            for (let i = 0; i < optimized.length; i++) {
-                const opt = optimized[i];
+                const opt = optimized[i]
                 if (opt instanceof Tag) {
                     const k = opt.key
                     const v = properties[k]
@@ -266,23 +266,24 @@ export class And extends TagsFilter {
                     if (v === undefined) {
                         continue
                     }
-                    if(opt.invert){
+                    if (opt.invert) {
                         // We should _not_ match this value
                         // If 'v' is given, we already know what value it should be
                         // If 'v' is the not-expected value, we have a conflict and return false
                         // Otherwise, we can safely drop this value
 
-                        const doesMatch = (typeof opt.value === "string" && v === opt.value) ||
+                        const doesMatch =
-                            (v.match(<RegExp> opt.value) !== null)
+                            (typeof opt.value === "string" && v === opt.value) ||
+                            v.match(<RegExp>opt.value) !== null
 
-                        if(doesMatch){
+                        if (doesMatch) {
                             // We have a conflict as 'opt' is inverted
                             return false
-                        }else{
+                        } else {
                             optimized.splice(i, 1)
                             i--
                         }
-                    }else if (v !== opt.value) {
+                    } else if (v !== opt.value) {
                         // detected an internal conflict
                         return false
                     }

Models/ThemeConfig/Conversion/PrepareLayer.ts

@@ -1,16 +1,26 @@
-import {Concat, Conversion, DesugaringContext, DesugaringStep, Each, FirstOf, Fuse, On, SetDefault,} from "./Conversion"
+import {
-import {LayerConfigJson} from "../Json/LayerConfigJson"
+    Concat,
-import {TagRenderingConfigJson} from "../Json/TagRenderingConfigJson"
+    Conversion,
-import {Utils} from "../../../Utils"
+    DesugaringContext,
+    DesugaringStep,
+    Each,
+    FirstOf,
+    Fuse,
+    On,
+    SetDefault,
+} from "./Conversion"
+import { LayerConfigJson } from "../Json/LayerConfigJson"
+import { TagRenderingConfigJson } from "../Json/TagRenderingConfigJson"
+import { Utils } from "../../../Utils"
 import RewritableConfigJson from "../Json/RewritableConfigJson"
 import SpecialVisualizations from "../../../UI/SpecialVisualizations"
 import Translations from "../../../UI/i18n/Translations"
-import {Translation} from "../../../UI/i18n/Translation"
+import { Translation } from "../../../UI/i18n/Translation"
 import tagrenderingconfigmeta from "../../../assets/tagrenderingconfigmeta.json"
-import {AddContextToTranslations} from "./AddContextToTranslations"
+import { AddContextToTranslations } from "./AddContextToTranslations"
 import FilterConfigJson from "../Json/FilterConfigJson"
 import predifined_filters from "../../../assets/layers/filters/filters.json"
-import {TagConfigJson} from "../Json/TagConfigJson"
+import { TagConfigJson } from "../Json/TagConfigJson"
 import PointRenderingConfigJson from "../Json/PointRenderingConfigJson"
 import LineRenderingConfigJson from "../Json/LineRenderingConfigJson"
 
@@ -40,11 +50,11 @@ class ExpandFilter extends DesugaringStep<LayerConfigJson> {
         context: string
     ): { result: LayerConfigJson; errors?: string[]; warnings?: string[]; information?: string[] } {
         if (json.filter === undefined || json.filter === null) {
-            return {result: json} // Nothing to change here
+            return { result: json } // Nothing to change here
         }
 
         if (json.filter["sameAs"] !== undefined) {
-            return {result: json} // Nothing to change here
+            return { result: json } // Nothing to change here
         }
 
         const newFilters: FilterConfigJson[] = []
@@ -161,7 +171,6 @@ class ExpandTagRendering extends Conversion<
     }
 
     private lookup(name: string): TagRenderingConfigJson[] | undefined {
-
         const direct = this.directLookup(name)
 
         if (direct === undefined) {
@@ -198,7 +207,7 @@ class ExpandTagRendering extends Conversion<
         if (state.tagRenderings.has(name)) {
             return [state.tagRenderings.get(name)]
         }
-        if(this._tagRenderingsByLabel.has(name)){
+        if (this._tagRenderingsByLabel.has(name)) {
             return this._tagRenderingsByLabel.get(name)
         }
 
@@ -239,7 +248,7 @@ class ExpandTagRendering extends Conversion<
                 if (found.condition === undefined) {
                     found.condition = layer.source.osmTags
                 } else {
-                    found.condition = {and: [found.condition, layer.source.osmTags]}
+                    found.condition = { and: [found.condition, layer.source.osmTags] }
                 }
             }
 
@@ -463,7 +472,7 @@ export class ExpandRewrite<T> extends Conversion<T | RewritableConfigJson<T>, T[
             }
 
             if (typeof obj === "object") {
-                obj = {...obj}
+                obj = { ...obj }
 
                 const isTr = targetIsTranslation && Translations.isProbablyATranslation(obj)
 
@@ -526,12 +535,12 @@ export class ExpandRewrite<T> extends Conversion<T | RewritableConfigJson<T>, T[
         context: string
     ): { result: T[]; errors?: string[]; warnings?: string[]; information?: string[] } {
         if (json === null || json === undefined) {
-            return {result: []}
+            return { result: [] }
         }
 
         if (json["rewrite"] === undefined) {
             // not a rewrite
-            return {result: [<T>json]}
+            return { result: [<T>json] }
         }
 
         const rewrite = <RewritableConfigJson<T>>json
@@ -571,7 +580,7 @@ export class ExpandRewrite<T> extends Conversion<T | RewritableConfigJson<T>, T[
             ts.push(t)
         }
 
-        return {result: ts}
+        return { result: ts }
     }
 }
 
@@ -855,7 +864,7 @@ class ExpandIconBadges extends DesugaringStep<PointRenderingConfigJson | LineRen
         information?: string[]
     } {
         if (!json["iconBadges"]) {
-            return {result: json}
+            return { result: json }
         }
         const badgesJson = (<PointRenderingConfigJson>json).iconBadges
 
@@ -866,7 +875,7 @@ class ExpandIconBadges extends DesugaringStep<PointRenderingConfigJson | LineRen
         for (let i = 0; i < badgesJson.length; i++) {
             const iconBadge: { if: TagConfigJson; then: string | TagRenderingConfigJson } =
                 badgesJson[i]
-            const {errors, result, warnings} = this._expand.convert(
+            const { errors, result, warnings } = this._expand.convert(
                 iconBadge.then,
                 context + ".iconBadges[" + i + "]"
             )
@@ -886,7 +895,7 @@ class ExpandIconBadges extends DesugaringStep<PointRenderingConfigJson | LineRen
         }
 
         return {
-            result: {...json, iconBadges},
+            result: { ...json, iconBadges },
             errors: errs,
             warnings: warns,
         }
@@ -899,7 +908,7 @@ class PreparePointRendering extends Fuse<PointRenderingConfigJson | LineRenderin
             "Prepares point renderings by expanding 'icon' and 'iconBadges'",
             new On(
                 "icon",
-                new FirstOf(new ExpandTagRendering(state, layer, {applyCondition: false}))
+                new FirstOf(new ExpandTagRendering(state, layer, { applyCondition: false }))
             ),
             new ExpandIconBadges(state, layer)
         )
@@ -922,7 +931,7 @@ export class PrepareLayer extends Fuse<LayerConfigJson> {
             new On(
                 "titleIcons",
                 (layer) =>
-                    new Concat(new ExpandTagRendering(state, layer, {noHardcodedStrings: true}))
+                    new Concat(new ExpandTagRendering(state, layer, { noHardcodedStrings: true }))
             ),
             new ExpandFilter(state)
         )

Models/ThemeConfig/SourceConfig.ts

@@ -58,7 +58,8 @@ export default class SourceConfig {
                     "Error at " +
                     context +
                     ": the specified tags are conflicting with each other: they will never match anything at all.\n" +
-                    "\tThe offending tags are: "+params.osmTags.asHumanString(false, false, {})+
+                    "\tThe offending tags are: " +
+                    params.osmTags.asHumanString(false, false, {}) +
                     "\tThey optmize into 'false' "
                 )
             }

test/Logic/Tags/OptimizeTags.spec.ts

@@ -1,10 +1,10 @@
-import {TagsFilter} from "../../../Logic/Tags/TagsFilter"
+import { TagsFilter } from "../../../Logic/Tags/TagsFilter"
-import {And} from "../../../Logic/Tags/And"
+import { And } from "../../../Logic/Tags/And"
-import {Tag} from "../../../Logic/Tags/Tag"
+import { Tag } from "../../../Logic/Tags/Tag"
-import {TagUtils} from "../../../Logic/Tags/TagUtils"
+import { TagUtils } from "../../../Logic/Tags/TagUtils"
-import {Or} from "../../../Logic/Tags/Or"
+import { Or } from "../../../Logic/Tags/Or"
-import {RegexTag} from "../../../Logic/Tags/RegexTag"
+import { RegexTag } from "../../../Logic/Tags/RegexTag"
-import {describe, expect, it} from "vitest"
+import { describe, expect, it } from "vitest"
 
 describe("Tag optimalization", () => {
     describe("And", () => {
@@ -76,7 +76,6 @@ describe("Tag optimalization", () => {
             const opt = t.optimize()
             expect(typeof opt !== "boolean").true
             expect(TagUtils.toString(<TagsFilter>opt)).toBe("shop=sports")
-
         })
 
         it("should optimize nested ORs", () => {
@@ -271,7 +270,7 @@ describe("Tag optimalization", () => {
                 or: [
                     "club=climbing",
                     {
-                        and: ["sport=climbing", {or: ["club~*", "office~*"]}],
+                        and: ["sport=climbing", { or: ["club~*", "office~*"] }],
                     },
                     {
                         and: [

vitest.config.ts

@@ -6,6 +6,6 @@ export default defineConfig({
     test: {
         globals: true,
         setupFiles: ["./test/testhooks.ts"],
-        include: ["./test/*.spec.ts","./test/**/*.spec.ts", "./*.doctest.ts", "./**/*.doctest.ts"],
+        include: ["./test/*.spec.ts", "./test/**/*.spec.ts", "./*.doctest.ts", "./**/*.doctest.ts"],
     },
 })