diff --git a/demo/src/app/geo/search/search.module.ts b/demo/src/app/geo/search/search.module.ts index 087a87c2d0..7e957e013d 100644 --- a/demo/src/app/geo/search/search.module.ts +++ b/demo/src/app/geo/search/search.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -// import { HttpClientModule } from '@angular/common/http'; import { MatCardModule, @@ -25,7 +24,6 @@ import { AppSearchRoutingModule } from './search-routing.module'; declarations: [AppSearchComponent], imports: [ CommonModule, - // HttpClientModule, AppSearchRoutingModule, MatCardModule, MatButtonModule, @@ -39,6 +37,7 @@ import { AppSearchRoutingModule } from './search-routing.module'; providers: [ provideIChercheSearchSource(), provideILayerSearchSource(), - provideNominatimSearchSource()] + provideNominatimSearchSource() + ] }) export class AppSearchModule {} diff --git a/packages/geo/src/lib/datasource/shared/datasource.service.ts b/packages/geo/src/lib/datasource/shared/datasource.service.ts index 94202a8dbb..a1dd685224 100644 --- a/packages/geo/src/lib/datasource/shared/datasource.service.ts +++ b/packages/geo/src/lib/datasource/shared/datasource.service.ts @@ -3,7 +3,7 @@ import { Observable, BehaviorSubject } from 'rxjs'; import { map } from 'rxjs/operators'; import { CapabilitiesService } from './capabilities.service'; - +import { WFSService } from './datasources/wfs.service'; import { DataSource, OSMDataSource, @@ -14,7 +14,6 @@ import { XYZDataSourceOptions, WFSDataSource, WFSDataSourceOptions, - WFSService, WMTSDataSource, WMTSDataSourceOptions, WMSDataSource, diff --git a/packages/geo/src/lib/search/search.module.ts b/packages/geo/src/lib/search/search.module.ts index 1aa1be8016..b2dbd980a0 100644 --- a/packages/geo/src/lib/search/search.module.ts +++ b/packages/geo/src/lib/search/search.module.ts @@ -2,9 +2,7 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; import { provideSearchSourceService } from './shared/search-source.service'; -import { - provideDefaultIChercheSearchResultFormatter -} from './shared/sources/icherche.providers'; +import { provideDefaultIChercheSearchResultFormatter } from './shared/sources/icherche.providers'; import { IgoSearchBarModule } from './search-bar/search-bar.module'; import { IgoSearchSelectorModule } from './search-selector/search-selector.module'; @@ -28,7 +26,7 @@ export class IgoSearchModule { static forRoot(): ModuleWithProviders { return { ngModule: IgoSearchModule, - providers: [ + providers: [ provideSearchSourceService(), provideDefaultIChercheSearchResultFormatter() ] diff --git a/packages/geo/src/lib/search/shared/search-source.service.ts b/packages/geo/src/lib/search/shared/search-source.service.ts index 5b3f0f4511..28a5c4f7b3 100644 --- a/packages/geo/src/lib/search/shared/search-source.service.ts +++ b/packages/geo/src/lib/search/shared/search-source.service.ts @@ -1,10 +1,9 @@ -import { SearchSource } from './sources'; +import { SearchSource } from './sources/source'; /** * Service where all available search sources are registered. */ export class SearchSourceService { - constructor(private sources: SearchSource[]) {} /** @@ -20,7 +19,9 @@ export class SearchSourceService { * @returns Search sources */ getEnabledSources(): SearchSource[] { - return this.getSources().filter((source: SearchSource) => source.enabled === true); + return this.getSources().filter( + (source: SearchSource) => source.enabled === true + ); } /** @@ -38,7 +39,6 @@ export class SearchSourceService { } }); } - } /** diff --git a/packages/geo/src/public_api.ts b/packages/geo/src/public_api.ts index 9721543d25..66f43d1e9a 100644 --- a/packages/geo/src/public_api.ts +++ b/packages/geo/src/public_api.ts @@ -26,6 +26,9 @@ export * from './lib/search/search-results/search-results.module'; export * from './lib/toast/toast.module'; export * from './lib/wkt/wkt.module'; +export * from './lib/search/shared/sources/icherche.providers'; +export * from './lib/search/shared/sources/ilayer.providers'; +export * from './lib/search/shared/sources/nominatim.providers'; export * from './lib/routing/routing-sources/routing-source.provider'; export * from './lib/routing/shared/routing-source.service';