From 5da56d8fa565cf96ed6aaa6e7ee21c6b809eb169 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Thu, 21 Sep 2023 12:13:42 +0200
Subject: [PATCH] Style: styling tweaks to plantnet flow

---
 assets/layers/tree_node/tree_node.json | 3 +--
 src/UI/PlantNet/PlantNet.svelte        | 8 ++++----
 src/UI/PlantNet/SpeciesButton.svelte   | 4 +---
 src/UI/Popup/LinkableImage.svelte      | 3 ++-
 src/UI/Popup/PlantNetDetectionViz.ts   | 1 -
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json
index 744cdc62d..67593332e 100644
--- a/assets/layers/tree_node/tree_node.json
+++ b/assets/layers/tree_node/tree_node.json
@@ -74,8 +74,7 @@
     "images",
     {
       "id": "plantnet",
-      "render": "{plantnet_detection()}",
-      "condition": "species:wikidata="
+      "render": "{plantnet_detection()}"
     },
     {
       "id": "tree-species-wikidata",
diff --git a/src/UI/PlantNet/PlantNet.svelte b/src/UI/PlantNet/PlantNet.svelte
index 170c7fc18..b828de04b 100644
--- a/src/UI/PlantNet/PlantNet.svelte
+++ b/src/UI/PlantNet/PlantNet.svelte
@@ -99,11 +99,11 @@
 
         <WikipediaPanel wikiIds={new ImmutableStore([selectedOption])} />
       </div>
-      <div class="flex justify-between">
+      <div class="flex flex-col items-stretch">
         <BackButton on:click={() => {selectedOption = undefined}}>
           <Tr t={t.back} />
         </BackButton>
-        <NextButton clss="primary shrink-0" on:click={() => { done = true; onConfirm(selectedOption); }} >
+        <NextButton clss="primary" on:click={() => { done = true; onConfirm(selectedOption); }} >
           <Tr t={t.confirm} />
         </NextButton>
       </div>
@@ -115,8 +115,8 @@
       <Tr t={t.tryAgain} />
     </BackButton>
   {/if}
-  <div class="flex p-2 bg-gray-200 rounded-xl self-end">
-    <ToSvelte construct={Svg.plantnet_logo_svg().SetClass("w-10 h-10 pr-1 mr-1 bg-white rounded-full")} />
+  <div class="flex p-2 low-interaction rounded-xl self-end">
+    <ToSvelte construct={Svg.plantnet_logo_svg().SetClass("w-8 h-8 p-1 mr-1 bg-white rounded-full")} />
     <Tr t={t.poweredByPlantnet} />
   </div>
 
diff --git a/src/UI/PlantNet/SpeciesButton.svelte b/src/UI/PlantNet/SpeciesButton.svelte
index de7f87333..9e3a44b91 100644
--- a/src/UI/PlantNet/SpeciesButton.svelte
+++ b/src/UI/PlantNet/SpeciesButton.svelte
@@ -36,9 +36,7 @@ const wikidataId: Store<string> = UIEventSource.FromPromise(
 ).mapD(wd => wd[0]?.species?.value);
 </script>
 
-<NextButton on:click={() =>{ 
-  console.log("Dispatching: ", $wikidataId)
-  return dispatch("selected", $wikidataId); }}>
+<NextButton on:click={() => dispatch("selected", $wikidataId)}>
   {#if $wikidata === undefined}
     <Loading>
       <Tr t={ t.loadingWikidata.Subs({
diff --git a/src/UI/Popup/LinkableImage.svelte b/src/UI/Popup/LinkableImage.svelte
index 798bebb09..d8eb7a5c5 100644
--- a/src/UI/Popup/LinkableImage.svelte
+++ b/src/UI/Popup/LinkableImage.svelte
@@ -25,7 +25,7 @@
   export let layer: LayerConfig;
 
   export let linkable = true;
-  let isLinked = false;
+  let isLinked = Object.values(tags.data).some(v => image.pictureUrl === v);
 
   const t = Translations.t.image.nearby;
   const c = [lon, lat];
@@ -35,6 +35,7 @@
     date: new Date(image.date)
   });
   let distance = Math.round(GeoOperations.distanceBetween([image.coordinates.lng, image.coordinates.lat], c));
+  
   $: {
     const currentTags = tags.data;
     const key = Object.keys(image.osmTags)[0];
diff --git a/src/UI/Popup/PlantNetDetectionViz.ts b/src/UI/Popup/PlantNetDetectionViz.ts
index 69397cabd..ed5a7acc4 100644
--- a/src/UI/Popup/PlantNetDetectionViz.ts
+++ b/src/UI/Popup/PlantNetDetectionViz.ts
@@ -1,6 +1,5 @@
 import { Store, UIEventSource } from "../../Logic/UIEventSource"
 import { ProvidedImage } from "../../Logic/ImageProviders/ImageProvider"
-import PlantNetSpeciesSearch from "../BigComponents/PlantNetSpeciesSearch"
 import Wikidata from "../../Logic/Web/Wikidata"
 import ChangeTagAction from "../../Logic/Osm/Actions/ChangeTagAction"
 import { And } from "../../Logic/Tags/And"