From 4849f881e69e81186d2027bee79f6f943d3a7531 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Thu, 9 Mar 2023 23:19:49 +0100
Subject: [PATCH] chore: formatting

---
 UI/Base/SubtleButton.svelte                   | 54 +++++++++----------
 UI/Base/SubtleButton.ts                       |  4 +-
 UI/BigComponents/CustomGeneratorButton.svelte |  4 +-
 UI/BigComponents/ThemeButton.svelte           |  2 +-
 UI/BigComponents/ThemesList.svelte            |  7 ++-
 test/Logic/OSM/ChangesetHandler.spec.ts       | 12 +++--
 test/Logic/Tags/OptimizeTags.spec.ts          | 54 ++++++++++---------
 test/Logic/Tags/TagUtils.spec.ts              |  1 -
 .../Conversion/CreateNoteImportLayer.spec.ts  |  4 +-
 9 files changed, 75 insertions(+), 67 deletions(-)

diff --git a/UI/Base/SubtleButton.svelte b/UI/Base/SubtleButton.svelte
index adce8c3ce..edd897372 100644
--- a/UI/Base/SubtleButton.svelte
+++ b/UI/Base/SubtleButton.svelte
@@ -1,62 +1,63 @@
 <script lang="ts">
-  import { onMount } from "svelte";
-  import { Store } from "../../Logic/UIEventSource";
-  import BaseUIElement from "../BaseUIElement";
-  import Img from "./Img";
-  import Translations from "../i18n/Translations";
-  import { ImmutableStore } from "../../Logic/UIEventSource.js";
+  import { onMount } from "svelte"
+  import { Store } from "../../Logic/UIEventSource"
+  import BaseUIElement from "../BaseUIElement"
+  import Img from "./Img"
+  import Translations from "../i18n/Translations"
+  import { ImmutableStore } from "../../Logic/UIEventSource.js"
 
-  export let imageUrl: string | BaseUIElement = undefined;
-  export let message: string | BaseUIElement = undefined;
+  export let imageUrl: string | BaseUIElement = undefined
+  export let message: string | BaseUIElement = undefined
   export let options: {
     url?: string | Store<string>
     newTab?: boolean
     imgSize?: string
     extraClasses?: string
-  } = {};
+  } = {}
 
   // Website to open when clicked
-  let href : Store<string> = undefined
-  if(options?.url){
-     href = typeof options?.url == "string" ? new ImmutableStore(options.url) : options.url;
+  let href: Store<string> = undefined
+  if (options?.url) {
+    href = typeof options?.url == "string" ? new ImmutableStore(options.url) : options.url
   }
 
-  let imgElem: HTMLElement;
-  let msgElem: HTMLElement;
-  let imgClasses = "block justify-center shrink-0 mr-4 " + (options?.imgSize ?? "h-11 w-11");
+  let imgElem: HTMLElement
+  let msgElem: HTMLElement
+  let imgClasses = "block justify-center shrink-0 mr-4 " + (options?.imgSize ?? "h-11 w-11")
 
   onMount(() => {
     // Image
     if (imgElem && imageUrl) {
-      let img: BaseUIElement;
+      let img: BaseUIElement
 
       if ((imageUrl ?? "") === "") {
-        img = undefined;
+        img = undefined
       } else if (typeof imageUrl !== "string") {
-        img = imageUrl?.SetClass(imgClasses);
+        img = imageUrl?.SetClass(imgClasses)
       }
-      if (img) imgElem.replaceWith(img.ConstructElement());
+      if (img) imgElem.replaceWith(img.ConstructElement())
     }
 
     // Message
     if (msgElem && message) {
-      let msg = Translations.W(message)?.SetClass("block text-ellipsis no-images flex-shrink");
-      msgElem.replaceWith(msg.ConstructElement());
+      let msg = Translations.W(message)?.SetClass("block text-ellipsis no-images flex-shrink")
+      msgElem.replaceWith(msg.ConstructElement())
     }
-  });
+  })
 </script>
 
 <svelte:element
-  class={(options.extraClasses??"") + 'flex hover:shadow-xl transition-[color,background-color,box-shadow] hover:bg-unsubtle'}
+  this={href === undefined ? "span" : "a"}
+  class={(options.extraClasses ?? "") +
+    "flex hover:shadow-xl transition-[color,background-color,box-shadow] hover:bg-unsubtle"}
   href={$href}
   target={options?.newTab ? "_blank" : ""}
-  this={href === undefined ? "span" : "a"}
 >
   <slot name="image">
     {#if imageUrl !== undefined}
       {#if typeof imageUrl === "string"}
-        <Img src={imageUrl} class={imgClasses+ " bg-red border border-black"}></Img>
-      {:else }
+        <Img src={imageUrl} class={imgClasses + " bg-red border border-black"} />
+      {:else}
         <template bind:this={imgElem} />
       {/if}
     {/if}
@@ -68,7 +69,6 @@
 </svelte:element>
 
 <style lang="scss">
-
   span,
   a {
     @apply flex p-3 my-2 py-4 rounded-lg shrink-0;
diff --git a/UI/Base/SubtleButton.ts b/UI/Base/SubtleButton.ts
index d84cbf647..cba9ab1db 100644
--- a/UI/Base/SubtleButton.ts
+++ b/UI/Base/SubtleButton.ts
@@ -13,7 +13,7 @@ export class SubtleButton extends UIElement {
     private readonly options: {
         url?: string | Store<string>
         newTab?: boolean
-        imgSize?: string,
+        imgSize?: string
         extraClasses?: string
     }
 
@@ -23,7 +23,7 @@ export class SubtleButton extends UIElement {
         options: {
             url?: string | Store<string>
             newTab?: boolean
-            imgSize?: "h-11 w-11" | string,
+            imgSize?: "h-11 w-11" | string
             extraClasses?: string
         } = {}
     ) {
diff --git a/UI/BigComponents/CustomGeneratorButton.svelte b/UI/BigComponents/CustomGeneratorButton.svelte
index df8577aa4..d420772a5 100644
--- a/UI/BigComponents/CustomGeneratorButton.svelte
+++ b/UI/BigComponents/CustomGeneratorButton.svelte
@@ -29,8 +29,8 @@
         url: "https://pietervdvn.github.io/mc/legacy/070/customGenerator.html",
       }}
     >
-      <span slot="image"  class="h-11 w-11 mx-4 bg-red" >
-        <ToSvelte construct={Svg.pencil_ui()}/>
+      <span slot="image" class="h-11 w-11 mx-4 bg-red">
+        <ToSvelte construct={Svg.pencil_ui()} />
       </span>
       <span slot="message">{t.createYourOwnTheme.toString()}</span>
     </SubtleButton>
diff --git a/UI/BigComponents/ThemeButton.svelte b/UI/BigComponents/ThemeButton.svelte
index 556ba4fc6..91da63b2f 100644
--- a/UI/BigComponents/ThemeButton.svelte
+++ b/UI/BigComponents/ThemeButton.svelte
@@ -6,7 +6,7 @@
   import UserDetails, { OsmConnection } from "../../Logic/Osm/OsmConnection"
   import Constants from "../../Models/Constants"
   import type Loc from "../../Models/Loc"
-  import type { LayoutInformation } from "../../Models/ThemeConfig/LayoutConfig";
+  import type { LayoutInformation } from "../../Models/ThemeConfig/LayoutConfig"
 
   export let theme: LayoutInformation
   export let isCustom: boolean = false
diff --git a/UI/BigComponents/ThemesList.svelte b/UI/BigComponents/ThemesList.svelte
index f79fff04b..f1a833add 100644
--- a/UI/BigComponents/ThemesList.svelte
+++ b/UI/BigComponents/ThemesList.svelte
@@ -8,7 +8,7 @@
   import CustomGeneratorButton from "./CustomGeneratorButton.svelte"
   import ProfessionalServicesButton from "./ProfessionalServicesButton.svelte"
   import ThemeButton from "./ThemeButton.svelte"
-  import { LayoutInformation } from "../../Models/ThemeConfig/LayoutConfig";
+  import { LayoutInformation } from "../../Models/ThemeConfig/LayoutConfig"
 
   export let search: UIEventSource<string>
   export let themes: LayoutInformation[]
@@ -55,7 +55,7 @@
         {/if}
       {/each}
     </div>
-    {:else }
+  {:else}
     <div>
       {#if ($search === undefined || $search === "") && !isCustom}
         <CustomGeneratorButton userDetails={state.osmConnection.userDetails} />
@@ -68,8 +68,7 @@
         {/if}
       {/each}
     </div>
-    {/if}
- 
+  {/if}
 
   {#if filteredThemes.length == 0}
     <NoThemeResultButton {search} />
diff --git a/test/Logic/OSM/ChangesetHandler.spec.ts b/test/Logic/OSM/ChangesetHandler.spec.ts
index 4f1f643f9..fa09e4e5d 100644
--- a/test/Logic/OSM/ChangesetHandler.spec.ts
+++ b/test/Logic/OSM/ChangesetHandler.spec.ts
@@ -57,7 +57,9 @@ describe("ChangesetHanlder", () => {
             const d = Utils.asDict(rewritten)
             expect(d.size).toEqual(10)
             expect(d.get("answer")).toEqual("5")
-            expect(d.get("comment")).toEqual("Adding data with #MapComplete for theme #toerisme_vlaanderen")
+            expect(d.get("comment")).toEqual(
+                "Adding data with #MapComplete for theme #toerisme_vlaanderen"
+            )
             expect(d.get("created_by")).toEqual("MapComplete 0.16.6")
             expect(d.get("host")).toEqual("https://mapcomplete.osm.be/toerisme_vlaanderen.html")
             expect(d.get("imagery")).toEqual("osm")
@@ -115,7 +117,9 @@ describe("ChangesetHanlder", () => {
 
             expect(d.size).toEqual(9)
             expect(d.get("answer")).toEqual("42")
-            expect(d.get("comment")).toEqual("Adding data with #MapComplete for theme #toerisme_vlaanderen")
+            expect(d.get("comment")).toEqual(
+                "Adding data with #MapComplete for theme #toerisme_vlaanderen"
+            )
             expect(d.get("created_by")).toEqual("MapComplete 0.16.6")
             expect(d.get("host")).toEqual("https://mapcomplete.osm.be/toerisme_vlaanderen.html")
             expect(d.get("imagery")).toEqual("osm")
@@ -166,7 +170,9 @@ describe("ChangesetHanlder", () => {
 
             expect(d.size).toEqual(9)
             expect(d.get("answer")).toEqual("5")
-            expect(d.get("comment")).toEqual("Adding data with #MapComplete for theme #toerisme_vlaanderen")
+            expect(d.get("comment")).toEqual(
+                "Adding data with #MapComplete for theme #toerisme_vlaanderen"
+            )
             expect(d.get("created_by")).toEqual("MapComplete 0.16.6")
             expect(d.get("host")).toEqual("https://mapcomplete.osm.be/toerisme_vlaanderen.html")
             expect(d.get("imagery")).toEqual("osm")
diff --git a/test/Logic/Tags/OptimizeTags.spec.ts b/test/Logic/Tags/OptimizeTags.spec.ts
index a68af9def..ab7127d72 100644
--- a/test/Logic/Tags/OptimizeTags.spec.ts
+++ b/test/Logic/Tags/OptimizeTags.spec.ts
@@ -258,31 +258,33 @@ describe("Tag optimalization", () => {
          )
          */
 
-        expect(opt).toEqual(TagUtils.Tag({
-            or: [
-                "club=climbing",
-                {
-                    and: ["sport=climbing", { or: ["club~*", "office~*"] }],
-                },
-                {
-                    and: [
-                        "sport=climbing",
-                        {
-                            or: [
-                                "leisure=sports_centre",
-                                {
-                                    and: [
-                                        "climbing!~route",
-                                        "climbing!=route_top",
-                                        "climbing!=route_bottom",
-                                        "leisure!~sports_centre",
-                                    ],
-                                },
-                            ],
-                        },
-                    ],
-                },
-            ],
-        }))
+        expect(opt).toEqual(
+            TagUtils.Tag({
+                or: [
+                    "club=climbing",
+                    {
+                        and: ["sport=climbing", { or: ["club~*", "office~*"] }],
+                    },
+                    {
+                        and: [
+                            "sport=climbing",
+                            {
+                                or: [
+                                    "leisure=sports_centre",
+                                    {
+                                        and: [
+                                            "climbing!~route",
+                                            "climbing!=route_top",
+                                            "climbing!=route_bottom",
+                                            "leisure!~sports_centre",
+                                        ],
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                ],
+            })
+        )
     })
 })
diff --git a/test/Logic/Tags/TagUtils.spec.ts b/test/Logic/Tags/TagUtils.spec.ts
index 309bd19a7..f0debd559 100644
--- a/test/Logic/Tags/TagUtils.spec.ts
+++ b/test/Logic/Tags/TagUtils.spec.ts
@@ -2,7 +2,6 @@ import { TagUtils } from "../../../Logic/Tags/TagUtils"
 import { equal } from "assert"
 import { describe, expect, it } from "vitest"
 
-
 describe("TagUtils", () => {
     describe("ParseTag", () => {
         it("should refuse a key!=* tag", () => {
diff --git a/test/Models/ThemeConfig/Conversion/CreateNoteImportLayer.spec.ts b/test/Models/ThemeConfig/Conversion/CreateNoteImportLayer.spec.ts
index f6e1f25e5..12499c550 100644
--- a/test/Models/ThemeConfig/Conversion/CreateNoteImportLayer.spec.ts
+++ b/test/Models/ThemeConfig/Conversion/CreateNoteImportLayer.spec.ts
@@ -23,7 +23,9 @@ describe("CreateNoteImportLayer", () => {
             layer,
             "ImportLayerGeneratorTest: convert"
         )
-        expect(generatedLayer.isShown["and"][1].or[0].and[0]).toEqual("_tags~(^|.*;)amenity=public_bookcase($|;.*)")
+        expect(generatedLayer.isShown["and"][1].or[0].and[0]).toEqual(
+            "_tags~(^|.*;)amenity=public_bookcase($|;.*)"
+        )
         // "Zoomlevel is to high"
         expect(generatedLayer.minzoom <= layer.minzoom).toBe(true)
         let renderings = Utils.NoNull(