From 4ae35ae101d610dcbc796b2351779ba3338e193b Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 8 Apr 2024 17:05:49 +0200
Subject: [PATCH] Improvement to auto-import module for velopark

---
 assets/themes/velopark/velopark.json          |  23 +-
 src/Logic/Web/LinkedDataLoader.ts             |   8 +-
 .../ThemeConfig/Conversion/PrepareLayer.ts    |   2 +-
 src/UI/Comparison/ComparisonAction.svelte     | 226 ++++++++++--------
 4 files changed, 155 insertions(+), 104 deletions(-)

diff --git a/assets/themes/velopark/velopark.json b/assets/themes/velopark/velopark.json
index 5ea69929d1..c13541093e 100644
--- a/assets/themes/velopark/velopark.json
+++ b/assets/themes/velopark/velopark.json
@@ -266,7 +266,28 @@
           },
           "icons.defaults"
         ],
-        "minzoom": 8
+        "minzoom": 8,
+        "filter+": [
+          {
+            "id": "last_edited_before",
+            "options": [
+              {
+
+
+            "question": {
+              "en": "Last edit was before {date}",
+              "nl": "Laatste aanpassing voor {date}"
+
+            },
+            "osmTags": "_last_edit:timestamp<{date}",
+            "fields": [
+              {
+                "name": "date",
+                "type": "date"
+              }
+            ]
+          }]}
+        ]
       }
     },
     {
diff --git a/src/Logic/Web/LinkedDataLoader.ts b/src/Logic/Web/LinkedDataLoader.ts
index 1ba52b3d3c..5595ee03e8 100644
--- a/src/Logic/Web/LinkedDataLoader.ts
+++ b/src/Logic/Web/LinkedDataLoader.ts
@@ -37,7 +37,7 @@ export default class LinkedDataLoader {
             "@type": "http://www.w3.org/2001/XMLSchema#time"
         }
     }
-    private static formatters: Record<string, Validator> = {
+    private static formatters: Record<"phone" | "email" | "website", Validator> = {
         phone: new PhoneValidator(),
         email: new EmailValidator(),
         website: new UrlValidator(undefined, undefined, true)
@@ -330,7 +330,11 @@ export default class LinkedDataLoader {
             delete output[source]
         }
 
-        on("phone", (p => new PhoneValidator().reformat(p, () => "be")))
+        on("phone", (p => this.formatters["phone"].reformat(p, () => "be")))
+
+        for (const attribute in LinkedDataLoader.formatters) {
+            on(attribute, p => LinkedDataLoader.formatters[attribute].reformat(p))
+        }
         on("charge", (p => {
             if(Number(p) === 0){
                 output["fee"] = ["no"]
diff --git a/src/Models/ThemeConfig/Conversion/PrepareLayer.ts b/src/Models/ThemeConfig/Conversion/PrepareLayer.ts
index af8177f22f..cd2a50dbbc 100644
--- a/src/Models/ThemeConfig/Conversion/PrepareLayer.ts
+++ b/src/Models/ThemeConfig/Conversion/PrepareLayer.ts
@@ -47,7 +47,7 @@ class ExpandFilter extends DesugaringStep<LayerConfigJson> {
     }
 
     private static load_filters(): Map<string, FilterConfigJson> {
-        let filters = new Map<string, FilterConfigJson>()
+        const filters = new Map<string, FilterConfigJson>()
         for (const filter of <FilterConfigJson[]>predifined_filters.filter) {
             filters.set(filter.id, filter)
         }
diff --git a/src/UI/Comparison/ComparisonAction.svelte b/src/UI/Comparison/ComparisonAction.svelte
index e1b55235b2..6d0b39091b 100644
--- a/src/UI/Comparison/ComparisonAction.svelte
+++ b/src/UI/Comparison/ComparisonAction.svelte
@@ -1,117 +1,143 @@
 <script lang="ts">
-    import { UIEventSource } from "../../Logic/UIEventSource"
-    import type { OsmTags } from "../../Models/OsmFeature"
-    import type { SpecialVisualizationState } from "../SpecialVisualization"
-    import type { Feature } from "geojson"
-    import LayerConfig from "../../Models/ThemeConfig/LayerConfig"
-    import ChangeTagAction from "../../Logic/Osm/Actions/ChangeTagAction"
-    import { Tag } from "../../Logic/Tags/Tag"
-    import TagRenderingAnswer from "../Popup/TagRendering/TagRenderingAnswer.svelte"
-    import Loading from "../Base/Loading.svelte"
-    import Tr from "../Base/Tr.svelte"
-    import Translations from "../i18n/Translations"
+  import { UIEventSource } from "../../Logic/UIEventSource"
+  import type { OsmTags } from "../../Models/OsmFeature"
+  import type { SpecialVisualizationState } from "../SpecialVisualization"
+  import type { Feature } from "geojson"
+  import LayerConfig from "../../Models/ThemeConfig/LayerConfig"
+  import ChangeTagAction from "../../Logic/Osm/Actions/ChangeTagAction"
+  import { Tag } from "../../Logic/Tags/Tag"
+  import TagRenderingAnswer from "../Popup/TagRendering/TagRenderingAnswer.svelte"
+  import Loading from "../Base/Loading.svelte"
+  import Tr from "../Base/Tr.svelte"
+  import Translations from "../i18n/Translations"
 
-    export let key: string
-    export let externalProperties: Record<string, string>
+  export let key: string
+  export let externalProperties: Record<string, string>
 
-    export let tags: UIEventSource<OsmTags>
-    export let state: SpecialVisualizationState
-    export let feature: Feature
-    export let layer: LayerConfig
+  export let tags: UIEventSource<OsmTags>
+  export let state: SpecialVisualizationState
+  let isTesting = state.featureSwitchIsTesting
+  let isDebug = state.featureSwitches.featureSwitchIsDebugging
+  let showTags = state.userRelatedState.showTags
+  export let feature: Feature
+  export let layer: LayerConfig
 
-    export let readonly = false
+  export let readonly = false
 
-    let currentStep: "init" | "applying" | "done" = "init"
+  let currentStep: "init" | "applying" | "done" = "init"
 
-    /**
-     * Copy the given key into OSM
-     * @param key
-     */
-    async function apply(key: string) {
-        currentStep = "applying"
-        const change = new ChangeTagAction(
-            tags.data.id,
-            new Tag(key, externalProperties[key]),
-            tags.data,
-            {
-                theme: state.layout.id,
-                changeType: "import",
-            },
-        )
-        await state.changes.applyChanges(await change.CreateChangeDescriptions())
-        currentStep = "done"
-    }
+  /**
+   * Copy the given key into OSM
+   * @param key
+   */
+  async function apply(key: string) {
+    currentStep = "applying"
+    const change = new ChangeTagAction(
+      tags.data.id,
+      new Tag(key, externalProperties[key]),
+      tags.data,
+      {
+        theme: state.layout.id,
+        changeType: "import"
+      }
+    )
+    await state.changes.applyChanges(await change.CreateChangeDescriptions())
+    currentStep = "done"
+  }
 
-    let _country = $tags["_country"]
-    let mockPropertiesOsm = { id: feature.properties.id, [key]: $tags[key], _country }
-    let mockPropertiesExternal = { id: feature.properties.id, [key]: externalProperties[key], _country }
-    let trsWithKeys = layer.tagRenderings.filter(tr => {
-        const keys: string[] = [].concat(...tr.usedTags().map(t => t.usedKeys()))
-        return keys.indexOf(key) >= 0
-    })
-    let renderingBoth = undefined // trsWithKeys.find(tr => tr.IsKnown(mockPropertiesOsm) && tr.IsKnown(mockPropertiesExternal))
-    let renderingExternal = undefined // renderingBoth ?? trsWithKeys.find(tr => tr.IsKnown(mockPropertiesExternal))
-    let onOverwrite = false
-    const t = Translations.t.external
+  let _country = $tags["_country"]
+  let mockPropertiesOsm = { id: feature.properties.id, [key]: $tags[key], _country }
+  let mockPropertiesExternal = { id: feature.properties.id, [key]: externalProperties[key], _country }
+  let trsWithKeys = layer.tagRenderings.filter(tr => {
+    const keys: string[] = [].concat(...tr.usedTags().map(t => t.usedKeys()))
+    return keys.indexOf(key) >= 0
+  })
+  let renderingBoth = trsWithKeys.find(tr => tr.IsKnown(mockPropertiesOsm) && tr.IsKnown(mockPropertiesExternal))
+  let renderingExternal = renderingBoth ?? trsWithKeys.find(tr => tr.IsKnown(mockPropertiesExternal))
+  let onOverwrite = false
+  const t = Translations.t.external
 </script>
 
 <div>
-  
-<div class="py-1 px-2 interactive flex w-full justify-between">
-  {#if renderingExternal}
-    <TagRenderingAnswer tags={new UIEventSource(mockPropertiesExternal)} selectedElement={feature}
-                        config={renderingExternal}
-                        {layer} {state} />
-  {:else}
-    <div class="flex gap-x-1 items-center">
-      <b>{key}</b>{externalProperties[key]}
+
+  <div class="py-1 px-2 interactive flex w-full justify-between">
+    <div class="flex flex-col">
+
+    <div>
+
+      {#if renderingExternal}
+        <TagRenderingAnswer tags={new UIEventSource(mockPropertiesExternal)} selectedElement={feature}
+                            config={renderingExternal}
+                            {layer} {state} />
+      {:else}
+        <div class="flex gap-x-1 items-center">
+          <b>{key}</b>{externalProperties[key]}
+        </div>
+
+      {/if}
     </div>
 
-  {/if}
-  {#if !readonly}
-    {#if currentStep === "init"}
-      <button class="small" on:click={() => apply(key)}
+      {#if $isTesting || $isDebug || $showTags === "yes" || $showTags === "always" || $showTags === "full"}
+        <div class="subtle text-sm">
 
-              on:mouseover={() => onOverwrite = true}
-              on:focus={() => onOverwrite = true}
-              on:blur={() => onOverwrite = false}
-              on:mouseout={() => onOverwrite = false  }
-      >
-        {#if $tags[key]}
-          <Tr t={t.overwrite}/>
-        {:else}
-          <Tr t={t.apply}/>
-          
-        {/if}
-      </button>
-    {:else if currentStep === "applying"}
-      <Loading />
-    {:else if currentStep === "done"}
-      <div class="thanks">
-      <Tr t={t.done}/>
-        
-      </div>
-    {:else}
-      <div class="alert">
-        <Tr t={t.error}/>
-      </div>
-    {/if}
-  {/if}
+          <span>
+        OSM:
+            {key}={$tags[key]}
+      </span>
+          <span>
+        Ext:
+            {key}= {externalProperties[key]}
+      </span>
+        </div>
+      {/if}
+    </div>
 
-</div>
-{#if $tags[key]}
-  <div class:glowing-shadow={onOverwrite}>
-    <span class="subtle">
-      <Tr t={t.currentInOsmIs}/>
-    </span>
-    {#if renderingBoth}
-      <TagRenderingAnswer tags={new UIEventSource(mockPropertiesOsm)} selectedElement={feature} config={renderingBoth}
-                          {layer} {state} />
-    {:else}
-      <div class="flex gap-x-2 items-center">
-        <b>{key}</b> {$tags[key]}
-      </div>
+
+    {#if !readonly}
+      {#if currentStep === "init"}
+        <button class="small" on:click={() => apply(key)}
+
+                on:mouseover={() => onOverwrite = true}
+                on:focus={() => onOverwrite = true}
+                on:blur={() => onOverwrite = false}
+                on:mouseout={() => onOverwrite = false  }
+        >
+          {#if $tags[key]}
+            <Tr t={t.overwrite} />
+          {:else}
+            <Tr t={t.apply} />
+
+          {/if}
+        </button>
+      {:else if currentStep === "applying"}
+        <Loading />
+      {:else if currentStep === "done"}
+        <div class="thanks">
+          <Tr t={t.done} />
+
+        </div>
+      {:else}
+        <div class="alert">
+          <Tr t={t.error} />
+        </div>
+      {/if}
     {/if}
+
   </div>
-{/if}
+  {#if $tags[key] && $tags[key] !== externalProperties[key]}
+    <div class:glowing-shadow={onOverwrite}>
+    <span class="subtle">
+      <Tr t={t.currentInOsmIs} />
+    </span>
+      {#if renderingBoth}
+        <TagRenderingAnswer tags={new UIEventSource(mockPropertiesOsm)} selectedElement={feature} config={renderingBoth}
+                            {layer} {state} />
+      {:else}
+        <div class="flex gap-x-2 items-center">
+          <b>{key}</b> {$tags[key]}
+        </div>
+      {/if}
+    </div>
+  {/if}
+
 </div>