Merge master

src/UI/BigComponents/CopyrightPanel.ts

@@ -40,11 +40,9 @@ export default class CopyrightPanel extends Combine {
         const t = Translations.t.general.attribution
         const layoutToUse = state.layout
 
-
-
-        const iconAttributions: BaseUIElement[] = (layoutToUse.getUsedImages()).map(
-            CopyrightPanel.IconAttribution
-        )
+        const iconAttributions: BaseUIElement[] = layoutToUse
+            .getUsedImages()
+            .map(CopyrightPanel.IconAttribution)
 
         let maintainer: BaseUIElement = undefined
         if (layoutToUse.credits !== undefined && layoutToUse.credits !== "") {

src/UI/BigComponents/ExtraLinkButton.svelte

@@ -8,7 +8,6 @@
   import Tr from "../Base/Tr.svelte"
   import Icon from "../Map/Icon.svelte"
 
-
   export let state: SpecialVisualizationState
   let theme = state.layout?.id ?? ""
   let config: ExtraLinkConfig = state.layout.extraLink
@@ -23,7 +22,7 @@
         ...loc,
         theme: theme,
         basepath,
-        language: Locale.language.data
+        language: Locale.language.data,
       }
       return Utils.SubstituteKeys(config.href, subs)
     },
@@ -31,25 +30,21 @@
   )
 </script>
 
+{#if config !== undefined && !(config.requirements.has("iframe") && !isIframe) && !(config.requirements.has("no-iframe") && isIframe) && !(config.requirements.has("welcome-message") && !$showWelcomeMessageSwitch) && !(config.requirements.has("no-welcome-message") && $showWelcomeMessageSwitch)}
+  <div class="links-as-button">
+    <a
+      href={$href}
+      target={config.newTab ? "_blank" : ""}
+      rel="noopener"
+      class="pointer-events-auto flex rounded-full border-black"
+    >
+      <Icon icon={config.icon} clss="w-6 h-6 m-2" />
 
-{#if config !== undefined &&
-!(config.requirements.has("iframe") && !isIframe) &&
-!(config.requirements.has("no-iframe") && isIframe) &&
-!(config.requirements.has("welcome-message") && !$showWelcomeMessageSwitch) &&
-!(config.requirements.has("no-welcome-message") && $showWelcomeMessageSwitch)}
-<div class="links-as-button">
-
-  <a href={$href} target={config.newTab ? "_blank" : ""} rel="noopener"
-     class="flex pointer-events-auto rounded-full border-black">
-
-    <Icon icon={config.icon} clss="w-6 h-6 m-2"/>
-
-    {#if config.text}
-      <Tr t={config.text} />
-    {:else}
-      <Tr t={t.screenToSmall.Subs({theme: state.layout.title})} />
-    {/if}
-
-  </a>
-</div>
+      {#if config.text}
+        <Tr t={config.text} />
+      {:else}
+        <Tr t={t.screenToSmall.Subs({ theme: state.layout.title })} />
+      {/if}
+    </a>
+  </div>
 {/if}

src/UI/BigComponents/FilterPanel.svelte

@@ -46,12 +46,12 @@
   }
 </script>
 
-<div class="h-full flex flex-col">
+<div class="flex h-full flex-col">
   <h2 class="low-interaction m-0 flex items-center p-4 drop-shadow-md">
     <Filter class="h-6 w-6 pr-2" />
     <Tr t={Translations.t.general.menu.filter} />
   </h2>
-  <div class="flex h-full flex-col overflow-auto p-4 border-b-2">
+  <div class="flex h-full flex-col overflow-auto border-b-2 p-4">
     {#each layout.layers as layer}
       <Filterview
         zoomlevel={state.mapProperties.zoom}

src/UI/BigComponents/OpenBackgroundSelectorButton.svelte

@@ -15,7 +15,7 @@
   export let state: ThemeViewState
   export let map: Store<MlMap> = undefined
   export let hideTooltip = false
-  export let htmlElem : UIEventSource<HTMLElement> = undefined
+  export let htmlElem: UIEventSource<HTMLElement> = undefined
 </script>
 
 <MapControlButton

src/UI/BigComponents/PrivacyPolicy.svelte

@@ -8,7 +8,7 @@
   const t = Translations.t.privacy
   export let state: SpecialVisualizationState
   const usersettings = UserRelatedState.usersettingsConfig
-  const editPrivacy = usersettings.tagRenderings.find(tr => tr.id === "more_privacy")
+  const editPrivacy = usersettings.tagRenderings.find((tr) => tr.id === "more_privacy")
   const isLoggedIn = state.osmConnection.isLoggedIn
 </script>
 
@@ -48,16 +48,19 @@
 
     <li>
       {#if $isLoggedIn}
-      <TagRenderingEditable config={editPrivacy} selectedElement={{
-              type: "Feature",
-              properties: { id: "settings" },
-              geometry: { type: "Point", coordinates: [0, 0] },
-            }}
-                            {state}
-                            tags={state.userRelatedState.preferencesAsTags} />
-        {:else}
-          <Tr t={t.items.distanceIndicator} />
-        {/if}
+        <TagRenderingEditable
+          config={editPrivacy}
+          selectedElement={{
+            type: "Feature",
+            properties: { id: "settings" },
+            geometry: { type: "Point", coordinates: [0, 0] },
+          }}
+          {state}
+          tags={state.userRelatedState.preferencesAsTags}
+        />
+      {:else}
+        <Tr t={t.items.distanceIndicator} />
+      {/if}
     </li>
   </ul>
 

src/UI/BigComponents/TagRenderingChart.ts

@@ -185,8 +185,6 @@ export class StackedRenderingChart extends ChartJs {
 }
 
 export default class TagRenderingChart extends Combine {
-
-
     /**
      * Creates a chart about this tagRendering for the given data
      */
@@ -223,9 +221,9 @@ export default class TagRenderingChart extends Combine {
             ChartJsColours.notApplicableBorderColor,
         ]
         const backgroundColor = [
-           ChartJsColours.unknownColor,
-           ChartJsColours.otherColor,
-           ChartJsColours.notApplicableColor,
+            ChartJsColours.unknownColor,
+            ChartJsColours.otherColor,
+            ChartJsColours.notApplicableColor,
         ]
 
         while (borderColor.length < data.length) {