Merge pull request #21 from swoocn/dev

Approved.
swoocn · Mar 27, 2024 · fda282e · fda282e
2 parents 10264a8 + b449c4c
commit fda282e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/frontend/src/app/home/home.component.ts b/frontend/src/app/home/home.component.ts
@@ -58,6 +58,6 @@ export class HomeComponent implements AfterViewInit, OnDestroy {
   }
 
   handleSearchTypeToggled(): void {
-    this.mapComponent.resetAndShowAllShops();
+    this.mapComponent.removeAllMarkersFromMap();
   }
 }
diff --git a/frontend/src/app/home/map/map.component.ts b/frontend/src/app/home/map/map.component.ts
@@ -123,12 +123,6 @@ export class MapComponent implements OnInit, OnDestroy {
     this.track();
   }
 
-  resetAndShowAllShops(): void {
-    this.filteredShops = this.allShops;
-    this.removeAllMarkersFromMap();
-    this.addAllCoordinatesToMap();
-  }
-
   // Filter shops based on search query
   filterShops(query: string, searchType: SearchType): void {
     this.logger.debug(`Filtering shops based on searchType: ${searchType}..`);
@@ -304,7 +298,7 @@ export class MapComponent implements OnInit, OnDestroy {
   }
 
   // remove all map markers except for user position
-  private removeAllMarkersFromMap(): void {
+  removeAllMarkersFromMap(): void {
     this.map.eachLayer((layer) => {
       if (layer instanceof L.Marker && !(layer.options as CustomMarkerOptions)?.isCurrentUser) {
         this.map.removeLayer(layer);