kolzchut/srm#551

kolzchut · Oct 19, 2023 · 568b736 · 568b736
1 parent 8f8110b
commit 568b736
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/projects/srm/src/app/autocomplete-results/search-results.component.ts b/projects/srm/src/app/autocomplete-results/search-results.component.ts
@@ -46,6 +46,7 @@ export class SearchResultsComponent implements OnInit, OnChanges, AfterViewInit
   // done = false;
   triggerVisible = false;
   searchHash: string | null = null;
+  geoHash: string | null = null;
 
   results: (Card | null)[] = [];
   obs: IntersectionObserver;
@@ -71,7 +72,16 @@ export class SearchResultsComponent implements OnInit, OnChanges, AfterViewInit
     this.paramsQueue.pipe(
       filter((params) => !!params),
       delay(1),
+      debounceTime(this.platform.browser() ? 2000 : 0),
       switchMap((params) => {
+        if (params.searchHash === this.searchHash && params.geoHash === this.geoHash) {
+          return from([]);
+        } else {
+          return from([params]);
+        }
+      }),
+      switchMap((params) => {
+        this.geoHash = params.geoHash;
         if (params.searchHash === this.searchHash) {
           return from([params]);
         } else {
@@ -93,7 +103,6 @@ export class SearchResultsComponent implements OnInit, OnChanges, AfterViewInit
           );
         }
       }),
-      debounceTime(this.platform.browser() ? 500 : 0),
     ).subscribe((params) => {
       this.offset = 0;
       this.fetchedOffset = -1;
@@ -104,7 +113,7 @@ export class SearchResultsComponent implements OnInit, OnChanges, AfterViewInit
         this.resultsSubscription = null;
       }
       this.fetchQueue = new ReplaySubject<SearchParamsOffset>(1);
-      this.resultsSubscription = timer(2000).pipe(
+      this.resultsSubscription = timer(1).pipe(
         switchMap(() => this.fetchQueue),
         filter((params) => {
           return params.offset > this.fetchedOffset;

diff --git a/projects/srm/src/app/consts.ts b/projects/srm/src/app/consts.ts
@@ -224,7 +224,7 @@ export class SearchParams {
     }
 
     get geoHash(): string {
-        return this.bounds?.map((x) => x.join(',')).join('|') || '';
+        return this.bounds?.map((x) => x.map((xx) => xx.toFixed(4)).join(',')).join('|') || '';
     }
 
     get hasFilters(): boolean {

diff --git a/projects/srm/src/app/page/page.component.less b/projects/srm/src/app/page/page.component.less
@@ -120,19 +120,21 @@
                                 box-shadow: 0px 0px 12px 0px rgba(171, 199, 255, 0.50);
                             });
                         }
-
-                        app-search-results {
-                            transform: translateY(0%);
-                            animation: 0.2s ease-in-out 1 forwards;
-                            animation-fill-mode: forwards;
-                            transition: transform 0.2s ease-in-out;
-                            &.shown {
-                                animation-name: show-results;
-                            }
-                            &.hidden {
-                                animation-name: hide-results;
+
+                        .mobile({
+                            app-search-results {
+                                transform: translateY(0%);
+                                animation: 0.2s ease-in-out 1 forwards;
+                                animation-fill-mode: forwards;
+                                transition: transform 0.2s ease-in-out;
+                                &.shown {
+                                    animation-name: show-results;
+                                }
+                                &.hidden {
+                                    animation-name: hide-results;
+                                }
                             }
-                        }
+                        });
 
                         app-disclaimer-footer {
                             margin-top: auto;

diff --git a/projects/srm/src/app/page/page.component.ts b/projects/srm/src/app/page/page.component.ts
@@ -135,6 +135,9 @@ export class PageComponent implements OnInit {
 
     this.searchParamsCalc.pipe(
       untilDestroyed(this),
+      filter((spc) => {
+        return this.stage === 'search-results';
+      }),
       debounceTime(platform.browser() ? 100 : 0),
       delay(1),
       map((spc) => {

diff --git a/projects/srm/src/app/results-drawer/results-drawer.component.less b/projects/srm/src/app/results-drawer/results-drawer.component.less
@@ -225,6 +225,7 @@
             overscroll-behavior-y: none;
             .no-scrollbars;
             flex: 1 1 auto;
+            z-index: 0;
         }
 
         .mobile({