feat(search): separe search and query results

infra-geo-ouverte · Jun 12, 2019 · fe228b3 · fe228b3
1 parent bbbba1f
commit fe228b3
Show file tree

Hide file tree

Showing 18 changed files with 372 additions and 814 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -12,15 +12,16 @@ import { IgoSpinnerModule, IgoStopPropagationModule } from '@igo2/common';
 import { IgoAuthModule } from '@igo2/auth';
 import {
   provideIChercheSearchSource,
+  provideIChercheReverseSearchSource,
   provideNominatimSearchSource,
+  provideCoordinatesReverseSearchSource,
   provideILayerSearchSource,
   provideOsrmRoutingSource
 } from '@igo2/geo';
 
 import { environment } from '../environments/environment';
 import { PortalModule } from './pages';
 import { AppComponent } from './app.component';
-import { AppReseauTransportQuebecModule } from './shared/search/sources/reseau-transport-quebec.module';
 
 @NgModule({
   declarations: [AppComponent],
@@ -32,8 +33,7 @@ import { AppReseauTransportQuebecModule } from './shared/search/sources/reseau-t
     IgoMessageModule,
     IgoSpinnerModule,
     IgoStopPropagationModule,
-    PortalModule,
-    AppReseauTransportQuebecModule
+    PortalModule
   ],
   providers: [
     provideConfigOptions({
@@ -43,6 +43,8 @@ import { AppReseauTransportQuebecModule } from './shared/search/sources/reseau-t
     RouteService,
     provideNominatimSearchSource(),
     provideIChercheSearchSource(),
+    provideIChercheReverseSearchSource(), // TODO: replace by territoire
+    provideCoordinatesReverseSearchSource(),
     provideILayerSearchSource(),
     provideOsrmRoutingSource()
   ],

diff --git a/src/app/pages/portal/portal.component.html b/src/app/pages/portal/portal.component.html
@@ -19,25 +19,28 @@
   </button>
 
   <igo-search-bar
+    [term]="searchBarTerm"
     [minLength]="minSearchTermLength"
     (change)="onSearchTermChange($event)"
     (search)="onSearch($event)">
   </igo-search-bar>
 
   <app-sidenav
-    [searchResult]="searchResult"
     [map]="map"
     [(opened)]="sidenavOpened">
   </app-sidenav>
 
   <igo-map-browser
+    #mapBrowser
     igoQuery
     [waitForAllQueries]="true"
     igoMapContext
     igoLayerContext
     igoDropGeoFile
     (query)="onMapQuery($event)"
     [map]="map"
+    [igoContextMenu]=actionbarMenu
+    (menuPosition)="onContextMenuOpen($event)"
     [ngClass]="{'igo-attribution-offset': map.getBaseLayers().length > 1}"
     [@mapStateX]="sidenavOpened ? 'right' : 'left'"
     (@mapStateX.start)="removeMapBrowserClass($event)"
@@ -90,17 +93,17 @@
 </app-expansion-panel>
 
 <app-toast-panel
-  [store]="searchStore"
+  [store]="queryStore"
   [@toastPanelOffsetX]="sidenavOpened"
-  [@toastPanelOffsetY]="expansionPanelExpanded">
+  [@toastPanelOffsetY]="expansionPanelExpanded"
+  (resultSelect)="addFeatureToMap($event)">
 </app-toast-panel>
 
-  <!-- <igo-toast
-    [map]="map"
-    [expanded]="toastOpened"
-    [feature]="featureService.focusedFeature$ | async"
-    (onOpened)="toastOpened=$event"
-    (swipeleft)="swipe($event.type)"
-    (swiperight)="swipe($event.type)"
-    *ngIf="toastShown">
-  </igo-toast> -->
+<ng-template #actionbarMenu>
+  <igo-actionbar
+    [store]="contextMenuStore"
+    [withIcon]="false"
+    [horizontal]="true"
+    mode="context">
+  </igo-actionbar>
+</ng-template>