refactor: structure for place

Author: NiclasNorin

js/features/createSearch/search.ts

@@ -1,4 +1,4 @@
-import { ListItemClickListener, SearchApiInterface, SearchEventCallback, SearchInterface, SearchLocationListItem, SearchUiInterface } from './searchInterface';
+import { ListItemClickListener, PlaceObject, SearchApiInterface, SearchCallback, SearchInterface, SearchUiInterface } from './searchInterface';
 import { MapInterface } from '../createMap/mapInterface';
 
 export class Search implements SearchInterface {
@@ -9,8 +9,8 @@ export class Search implements SearchInterface {
         private searchUi: SearchUiInterface
     ) {}
 
-    public addSearchListener(searchEventCallback: SearchEventCallback): this {
-        this.apiInstance.addSearchListener(searchEventCallback);
+    public addSearchResponseCallback(searchEventCallback: SearchCallback): this {
+        this.apiInstance.addSearchResponseCallback(searchEventCallback);
         return this;
     }
 
@@ -24,12 +24,12 @@ export class Search implements SearchInterface {
         return this;
     }
 
-    public setSearchListItems(items: SearchLocationListItem[]): this {
+    public setSearchListItems(items: any): this {
         this.searchUi.setSearchListItems(items);
         return this;
     }
 
-    public search(question: string): Promise<any> {
+    public search(question: string): Promise<PlaceObject[]> {
         return this.apiInstance.search(question);
     }
 

js/features/createSearch/search/api.ts

@@ -1,13 +1,12 @@
-import { SearchCallback } from "../../../types";
-import { SearchApiInterface } from "../searchInterface";
+import { PlaceObject, SearchApiInterface, SearchCallback } from "../searchInterface";
 
 export class SearchApi implements SearchApiInterface {
     private apiUrl: URL|null = null;
     private searchParam: string|null = null;
     private searchListeners: SearchCallback[] = [];
     private searchResults: any = {};
 
-    public search(question: string): Promise<any> {
+    public search(question: string): Promise<PlaceObject[]> {
         if (this.apiUrl === null || this.searchParam === null) {
             throw new Error("API URL and search parameter must be set before searching.");
         }
@@ -42,12 +41,12 @@ export class SearchApi implements SearchApiInterface {
             })
             .catch(error => {
                 console.error('Error:', error);
-                return null;
+                return Promise.resolve([]);
             });
     }
 
     // Adding listeners gives you a chance to change the response value
-    public addSearchListener(callback: SearchCallback): this {
+    public addSearchResponseCallback(callback: SearchCallback): this {
         this.searchListeners.push(callback);
         return this;
     }

js/features/createSearch/search/searchUi.ts

@@ -1,6 +1,6 @@
 import L, { Map as LeafletMap} from 'leaflet';
 import { MapInterface } from '../../createMap/mapInterface';
-import { ListItemClickListener, SearchApiInterface, SearchLocationListItem, SearchUiInterface } from '../searchInterface';
+import { ListItemClickListener, PlaceObject, SearchApiInterface, SearchUiInterface } from '../searchInterface';
 import { SearchOptions } from '../createSearchInterface';
 
 export class SearchUi implements SearchUiInterface {
@@ -15,8 +15,8 @@ export class SearchUi implements SearchUiInterface {
     private listenForInput(): void {
         const debouncedSearch = this.debounce((value: string) => {
             this.searchApi.search(value)
-            .then((data: any) => {
-                console.log(data);
+            .then((data: PlaceObject[]) => {
+                this.setSearchListItems(data);
             });
         }, 500);
 
@@ -32,7 +32,7 @@ export class SearchUi implements SearchUiInterface {
         return this;
     }
 
-    public setSearchListItems(items: SearchLocationListItem[]): this {
+    public setSearchListItems(items: PlaceObject[]): this {
         const listContainer = this.getList();
         if (!listContainer) {
             throw new Error('List container not found');
@@ -44,13 +44,13 @@ export class SearchUi implements SearchUiInterface {
             listContainer.innerHTML = '';
         }
 
-        items.forEach(item => {
+        items.forEach((item: PlaceObject) => {
             const listItem = this.createListItem(item);
 
             listItem.addEventListener('click', () => {
                 this.itemClickListeners.forEach(listener => listener(item));
                 if (this.input) {
-                    this.input.value = item.title;
+                    this.input.value = item.address as string;
                     this.input.focus();
                 }
 
@@ -63,9 +63,10 @@ export class SearchUi implements SearchUiInterface {
         return this;
     }
 
-    private createListItem(item: SearchLocationListItem): HTMLLIElement {
+    private createListItem(item: PlaceObject): HTMLLIElement {
+        console.log(item);
         const li = document.createElement('li');
-        li.innerHTML = `<span>${item.title}</span>`;
+        li.innerHTML = `<span>${item.address}</span>`;
 
         return li;
     }