Fixed centering & drawing geometries on spatial search, removed spati…

…al search Pinia stores
RDFLib · Aug 31, 2023 · 10ba156 · 10ba156
1 parent fc05e5d
commit 10ba156
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 538 deletions.
diff --git a/src/components/MapClient.d.ts b/src/components/MapClient.d.ts
@@ -19,3 +19,13 @@ export enum ShapeTypes {
 }
 
 export type DrawingModes = 'MARKER' | 'RECTANGLE' | 'POLYGON'
+
+/** well known text simplified result object, as returned by mapSearch */
+export type WKTResult = {
+    uri: string
+    link: string
+    wkt: string
+    fcLabel: string
+    label: string
+    id?: string
+}
diff --git a/src/components/MapClient.vue b/src/components/MapClient.vue
@@ -6,7 +6,7 @@ import { wktToGeoJSON } from "@terraformer/wkt"
 import { mapConfigKey, type MapConfig } from "@/types";
 import { convertConfigTypes } from '@/util/mapSearchHelper'
 import type { MapOptionsCenter } from '@/types'
-import type { WKTResult } from '@/stores/mapSearchStore.d';
+import type { WKTResult } from "@/components/MapClient.d";
 import { ShapeTypes, type DrawingModes } from "@/components/MapClient.d";
 
 

diff --git a/src/components/search/CatPrezSearchMap.vue b/src/components/search/CatPrezSearchMap.vue
@@ -172,7 +172,6 @@ async function getThemes() {
  * Performs search via a SPARQL query
  */
 async function doSearch() {
-    console.log("performing search...")
     const searchData = await searchSparqlGetRequest(`${apiBaseUrl}/sparql`, query.value);
     if (searchData && !searchError.value) {
         results.value = (searchData.results.bindings as SparqlBinding[]).map(result => {
@@ -317,7 +316,6 @@ onMounted(async () => {
             </div>
             <div class="search-map">
                 <MapClient
-                    ref="searchMapRef"
                     :drawing-modes="['RECTANGLE']"
                     @selectionUpdated="handleMapSelectionChange"
                 />

diff --git a/src/components/search/SpacePrezSearchMap.vue b/src/components/search/SpacePrezSearchMap.vue
@@ -256,6 +256,9 @@ async function doSearch() {
                     label: result.f_label ? result.f_label.value : ""
                 }
             });
+            if (searchMap.value) {
+                searchMap.value.drawShape(results.value);
+            }
         }
     }
 }

diff --git a/src/stores/catalogQueries.d.ts b/src/stores/catalogQueries.d.ts
diff --git a/src/stores/catalogQueries.ts b/src/stores/catalogQueries.ts
diff --git a/src/stores/datasetsStore.d.ts b/src/stores/datasetsStore.d.ts