@igo2/geo 17.0.0-next.6 → 17.0.0-next.8

package/lib/search/shared/search.service.d.ts

@@ -1,3 +1,5 @@
+import { WritableSignal } from '@angular/core';
+import { AnalyticsService } from '@igo2/core/analytics';
 import { StorageService } from '@igo2/core/storage';
 import { MapService } from '../../map/shared/map.service';
 import { SearchSourceService } from './search-source.service';
@@ -15,7 +17,10 @@ export declare class SearchService {
     private searchSourceService;
     private mapService;
     private storageService;
-    constructor(searchSourceService: SearchSourceService, mapService: MapService, storageService: StorageService);
+    private analyticsService;
+    searchTerm: WritableSignal<string>;
+    constructor(searchSourceService: SearchSourceService, mapService: MapService, storageService: StorageService, analyticsService: AnalyticsService, analytics: boolean);
+    private handleAnalytics;
     /**
      * Perform a research by text
      * @param term Any text
@@ -48,6 +53,6 @@ export declare class SearchService {
      * @returns True if the search term is valid
      */
     private termIsValid;
-    static ɵfac: i0.ɵɵFactoryDeclaration<SearchService, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<SearchService, [null, null, null, null, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<SearchService>;
 }

package/lib/search/shared/sources/cadastre.providers.d.ts

@@ -4,6 +4,7 @@ import { LanguageService } from '@igo2/core/language';
 import { StorageService } from '@igo2/core/storage';
 import { CadastreSearchSource } from './cadastre';
 import { SearchSource } from './source';
+import { SearchSourceFeature, SearchSourceKind } from './source.interfaces';
 /**
  * Cadastre search source factory
  * @ignore
@@ -18,3 +19,4 @@ export declare function provideCadastreSearchSource(): {
     multi: boolean;
     deps: (typeof HttpClient | typeof LanguageService | typeof StorageService | typeof ConfigService)[];
 };
+export declare function withCadastreSource(): SearchSourceFeature<SearchSourceKind.Cadastre>;

package/lib/search/shared/sources/coordinates.providers.d.ts

@@ -4,6 +4,7 @@ import { StorageService } from '@igo2/core/storage';
 import { ProjectionService } from '../../../map/shared/projection.service';
 import { CoordinatesReverseSearchSource, CoordinatesSearchResultFormatter } from './coordinates';
 import { SearchSource } from './source';
+import { SearchSourceFeature, SearchSourceKind } from './source.interfaces';
 /**
  * Coordinate search result formatter factory
  * @ignore
@@ -31,3 +32,4 @@ export declare function provideCoordinatesReverseSearchSource(): {
     multi: boolean;
     deps: (typeof ProjectionService | typeof LanguageService | typeof StorageService | typeof ConfigService)[];
 };
+export declare function withCoordinatesReverseSource(): SearchSourceFeature<SearchSourceKind.CoordinatesReverse>;

package/lib/search/shared/sources/icherche-icons.d.ts

@@ -1,4 +1,4 @@
-import { IconSvg } from '@igo2/common';
+import { IconSvg } from '@igo2/common/icon';
 /**
  * Icons mappings to be retrocompatible with iCherche
  */

package/lib/search/shared/sources/icherche.providers.d.ts

@@ -1,10 +1,11 @@
 import { HttpClient } from '@angular/common/http';
-import { Injector } from '@angular/core';
+import { Injector, Provider } from '@angular/core';
 import { ConfigService } from '@igo2/core/config';
 import { LanguageService } from '@igo2/core/language';
 import { StorageService } from '@igo2/core/storage';
 import { IChercheReverseSearchSource, IChercheSearchResultFormatter, IChercheSearchSource } from './icherche';
 import { SearchSource } from './source';
+import { SearchSourceFeature, SearchSourceKind } from './source.interfaces';
 /**
  * ICherche search result formatter factory
  * @ignore
@@ -13,11 +14,7 @@ export declare function defaultIChercheSearchResultFormatterFactory(languageServ
 /**
  * Function that returns a provider for the ICherche search result formatter
  */
-export declare function provideDefaultIChercheSearchResultFormatter(): {
-    provide: typeof IChercheSearchResultFormatter;
-    useFactory: typeof defaultIChercheSearchResultFormatterFactory;
-    deps: (typeof LanguageService)[];
-};
+export declare function provideDefaultIChercheSearchResultFormatter(): Provider;
 /**
  * ICherche search source factory
  * @ignore
@@ -26,12 +23,8 @@ export declare function ichercheSearchSourceFactory(http: HttpClient, languageSe
 /**
  * Function that returns a provider for the ICherche search source
  */
-export declare function provideIChercheSearchSource(): {
-    provide: typeof SearchSource;
-    useFactory: typeof ichercheSearchSourceFactory;
-    multi: boolean;
-    deps: (typeof HttpClient | typeof LanguageService | typeof StorageService | typeof ConfigService | typeof IChercheSearchResultFormatter | typeof Injector)[];
-};
+export declare function provideIChercheSearchSource(): Provider;
+export declare function withIChercheSource(): SearchSourceFeature<SearchSourceKind.ICherche>;
 /**
  * IChercheReverse search source factory
  * @ignore
@@ -46,3 +39,4 @@ export declare function provideIChercheReverseSearchSource(): {
     multi: boolean;
     deps: (typeof HttpClient | typeof LanguageService | typeof StorageService | typeof ConfigService | typeof Injector)[];
 };
+export declare function withIChercheReverseSource(): SearchSourceFeature<SearchSourceKind.IChercheReverse>;

package/lib/search/shared/sources/ilayer.providers.d.ts

@@ -4,6 +4,7 @@ import { LanguageService } from '@igo2/core/language';
 import { StorageService } from '@igo2/core/storage';
 import { ILayerSearchResultFormatter, ILayerSearchSource } from './ilayer';
 import { SearchSource } from './source';
+import { SearchSourceFeature, SearchSourceKind } from './source.interfaces';
 /**
  * ILayer search result formatter factory
  * @ignore
@@ -31,3 +32,4 @@ export declare function provideILayerSearchSource(): {
     multi: boolean;
     deps: (typeof HttpClient | typeof LanguageService | typeof StorageService | typeof ConfigService | typeof ILayerSearchResultFormatter)[];
 };
+export declare function withILayerSource(): SearchSourceFeature<SearchSourceKind.ILayer>;

package/lib/search/shared/sources/nominatim.providers.d.ts

@@ -3,6 +3,7 @@ import { ConfigService } from '@igo2/core/config';
 import { StorageService } from '@igo2/core/storage';
 import { NominatimSearchSource } from './nominatim';
 import { SearchSource } from './source';
+import { SearchSourceFeature, SearchSourceKind } from './source.interfaces';
 /**
  * Nominatim search source factory
  * @ignore
@@ -17,3 +18,4 @@ export declare function provideNominatimSearchSource(): {
     multi: boolean;
     deps: (typeof HttpClient | typeof StorageService | typeof ConfigService)[];
 };
+export declare function withNominatimSource(): SearchSourceFeature<SearchSourceKind.Nominatim>;

package/lib/search/shared/sources/source.d.ts

@@ -1,4 +1,4 @@
-import { Workspace } from '@igo2/common';
+import { Workspace } from '@igo2/common/workspace';
 import { StorageService } from '@igo2/core/storage';
 import { FeatureStore } from '../../../feature/shared/store';
 import { ISearchSourceParams, SearchSourceOptions, SearchSourceSettings } from './source.interfaces';

package/lib/search/shared/sources/source.interfaces.d.ts

@@ -1,3 +1,4 @@
+import { Provider } from '@angular/core';
 export interface SearchSourceOptions {
     title?: string;
     searchUrl?: string;
@@ -51,3 +52,18 @@ export interface ReverseSearchOptions {
         [key: string]: string;
     };
 }
+export interface SearchSourceFeature<KindT extends SearchSourceKind> {
+    kind: KindT;
+    providers: Provider[];
+}
+export declare enum SearchSourceKind {
+    ICherche = 0,
+    IChercheReverse = 1,
+    Cadastre = 2,
+    CoordinatesReverse = 3,
+    ILayer = 4,
+    Nominatim = 5,
+    StoredQueries = 6,
+    StoredQueriesReverse = 7,
+    Workspace = 8
+}

package/lib/search/shared/sources/storedqueries.providers.d.ts

@@ -3,6 +3,7 @@ import { ConfigService } from '@igo2/core/config';
 import { LanguageService } from '@igo2/core/language';
 import { StorageService } from '@igo2/core/storage';
 import { SearchSource } from './source';
+import { SearchSourceFeature, SearchSourceKind } from './source.interfaces';
 import { StoredQueriesReverseSearchSource, StoredQueriesSearchSource } from './storedqueries';
 /**
  * StoredQueries search source factory
@@ -18,6 +19,7 @@ export declare function provideStoredQueriesSearchSource(): {
     multi: boolean;
     deps: (typeof HttpClient | typeof LanguageService | typeof StorageService | typeof ConfigService)[];
 };
+export declare function withStoredQueriesSource(): SearchSourceFeature<SearchSourceKind.StoredQueries>;
 /**
  * StoredQueriesReverse search source factory
  * @ignore
@@ -32,3 +34,4 @@ export declare function provideStoredQueriesReverseSearchSource(): {
     multi: boolean;
     deps: (typeof HttpClient | typeof LanguageService | typeof StorageService | typeof ConfigService)[];
 };
+export declare function withStoredQueriesReverseSource(): SearchSourceFeature<SearchSourceKind.StoredQueriesReverse>;

package/lib/search/shared/sources/workspace.providers.d.ts

@@ -2,6 +2,7 @@ import { ConfigService } from '@igo2/core/config';
 import { LanguageService } from '@igo2/core/language';
 import { StorageService } from '@igo2/core/storage';
 import { SearchSource } from './source';
+import { SearchSourceFeature, SearchSourceKind } from './source.interfaces';
 import { WorkspaceSearchSource } from './workspace';
 /**
  * Workspace search source factory
@@ -17,3 +18,4 @@ export declare function provideWorkspaceSearchSource(): {
     multi: boolean;
     deps: (typeof LanguageService | typeof StorageService | typeof ConfigService)[];
 };
+export declare function withWorkspaceSource(): SearchSourceFeature<SearchSourceKind.Workspace>;

package/lib/toast/toast.component.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from '@angular/core';
-import { FlexibleState } from '@igo2/common';
+import { FlexibleState } from '@igo2/common/flexible';
 import { Feature } from '../feature/shared/feature.interfaces';
 import { IgoMap } from '../map/shared/map';
 import * as i0 from "@angular/core";

package/lib/wkt/shared/wkt.service.d.ts

@@ -1,7 +1,7 @@
 import * as i0 from "@angular/core";
 export declare class WktService {
     constructor();
-    wktToFeature(wkt: any, wktProj: any, featureProj: any): import("ol/Feature").default<import("ol/geom/Geometry").default>;
+    wktToFeature(wkt: any, wktProj: any, featureProj: any): import("ol").Feature<import("ol/geom").Geometry>;
     extentToWkt(epsgTO: any, extent: any, extentProj: any): {
         wktPoly: string;
         wktLine: string;

package/lib/workspace/shared/edition-workspace.d.ts

@@ -1,5 +1,5 @@
 import { MatDialog } from '@angular/material/dialog';
-import { Workspace, WorkspaceOptions } from '@igo2/common';
+import { Workspace, WorkspaceOptions } from '@igo2/common/workspace';
 import { ConfigService } from '@igo2/core/config';
 import OlFeature from 'ol/Feature';
 import type { Type } from 'ol/geom/Geometry';

package/lib/workspace/shared/feature-workspace.d.ts

@@ -1,4 +1,4 @@
-import { Workspace, WorkspaceOptions } from '@igo2/common';
+import { Workspace, WorkspaceOptions } from '@igo2/common/workspace';
 import { BehaviorSubject } from 'rxjs';
 import { VectorLayer } from '../../layer/shared';
 import { IgoMap } from '../../map/shared/map';

package/lib/workspace/shared/wfs-workspace.d.ts

@@ -1,4 +1,4 @@
-import { Workspace, WorkspaceOptions } from '@igo2/common';
+import { Workspace, WorkspaceOptions } from '@igo2/common/workspace';
 import { BehaviorSubject } from 'rxjs';
 import { VectorLayer } from '../../layer/shared';
 import { IgoMap } from '../../map/shared/map';

package/lib/workspace/shared/workspace.utils.d.ts

@@ -1,4 +1,5 @@
-import { EntityRecord, EntityStoreFilterCustomFuncStrategy, EntityTableButton, EntityTableColumnRenderer, Workspace } from '@igo2/common';
+import { EntityRecord, EntityStoreFilterCustomFuncStrategy, EntityTableButton, EntityTableColumnRenderer } from '@igo2/common/entity';
+import { Workspace } from '@igo2/common/workspace';
 import { Observable } from 'rxjs';
 import { Feature } from '../../feature/shared/feature.interfaces';
 import { LayerService, VectorLayer } from '../../layer/shared';

package/lib/workspace/widgets/ogc-filter/ogc-filter.component.d.ts

@@ -1,5 +1,6 @@
 import { ChangeDetectorRef, EventEmitter } from '@angular/core';
-import { OnUpdateInputs, WidgetComponent } from '@igo2/common';
+import { OnUpdateInputs } from '@igo2/common/dynamic-component';
+import { WidgetComponent } from '@igo2/common/widget';
 import { Layer } from '../../../layer/shared/layers/layer';
 import { IgoMap } from '../../../map/shared/map';
 import * as i0 from "@angular/core";

package/lib/workspace/widgets/widgets.d.ts

@@ -1,5 +1,5 @@
 import { InjectionToken } from '@angular/core';
-import { Widget, WidgetService } from '@igo2/common';
+import { Widget, WidgetService } from '@igo2/common/widget';
 export declare const OgcFilterWidget: InjectionToken<Widget>;
 export declare function ogcFilterWidgetFactory(widgetService: WidgetService): Widget;
 export declare function provideOgcFilterWidget(): {

package/lib/workspace/workspace-selector/workspace-selector.directive.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
-import { WorkspaceSelectorComponent, WorkspaceStore } from '@igo2/common';
+import { WorkspaceSelectorComponent, WorkspaceStore } from '@igo2/common/workspace';
 import { ImageLayer, VectorLayer } from '../../layer/shared';
 import { IgoMap } from '../../map/shared/map';
 import { EditionWorkspaceService } from '../shared/edition-workspace.service';

package/lib/workspace/workspace-updator/workspace-updator.directive.d.ts

@@ -1,5 +1,5 @@
 import { OnDestroy, OnInit } from '@angular/core';
-import type { WorkspaceStore } from '@igo2/common';
+import type { WorkspaceStore } from '@igo2/common/workspace';
 import { IgoMap } from '../../map/shared/map';
 import { EditionWorkspaceService } from '../shared/edition-workspace.service';
 import { FeatureWorkspaceService } from '../shared/feature-workspace.service';

package/lib/workspace/workspace.module.d.ts

@@ -1,5 +1,5 @@
 import * as i0 from "@angular/core";
-import * as i1 from "@igo2/common";
+import * as i1 from "@igo2/common/widget";
 import * as i2 from "./widgets/ogc-filter/ogc-filter.module";
 import * as i3 from "./workspace-selector/workspace-selector.module";
 import * as i4 from "@angular/material/dialog";

package/locale/en.geo.json

@@ -346,7 +346,8 @@
           "bottomright": "Bottom right corner of the map",
           "newpage": "On a new page",
           "newimage": "On a new image"
-        }
+        },
+        "showNorthArrow": "Show north arrow"
       },
       "directionsForm": {
         "stopLayer": "Directions - stops",
@@ -378,7 +379,12 @@
           "copyMsgLink": "Link for directions copied to clipboard",
           "copyTitle": "Directions"
         },
-        "toggleActive": "Activate direction control"
+        "toggleActive": "Activate direction control",
+        "toggleType": "Include forest roads",
+        "forestRoadsWarning": {
+          "title": "Warning",
+          "text": "Some forest roads may be impassable or not suitable for vehicles."
+        }
       },
       "directions": {
         "uturn": "u-turn",

package/locale/fr.geo.json

@@ -346,7 +346,8 @@
           "bottomright": "Coin bas droit de la carte",
           "newpage": "Sur une nouvelle page",
           "newimage": "Sur une nouvelle image"
-        }
+        },
+        "showNorthArrow": "Afficher la flèche du nord"
       },
       "directionsForm": {
         "stopLayer": "Itinéraire - Arrêts",
@@ -378,7 +379,12 @@
           "copyMsgLink": "Le lien de l'itinéraire est copié dans le presse-papier",
           "copyTitle": "Itinéraire"
         },
-        "toggleActive": "Activer le contrôle d'itinéraire"
+        "toggleActive": "Activer le contrôle d'itinéraire",
+        "toggleType": "Inclure les chemins forestiers",
+        "forestRoadsWarning": {
+          "title": "Avertissement",
+          "text": "Certains chemins forestiers peuvent être impraticables ou non carrossables."
+        }
       },
       "directions": {
         "uturn": "demi-tour",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "17.0.0-next.6",
+  "version": "17.0.0-next.8",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [
@@ -51,10 +51,10 @@
     "@angular/material": "^17.0.3",
     "@angular/material-moment-adapter": "^17.1.0",
     "@angular/platform-browser": "^17.0.6",
-    "@igo2/auth": "^17.0.0-next.6",
-    "@igo2/common": "^17.0.0-next.6",
-    "@igo2/core": "^17.0.0-next.6",
-    "@igo2/utils": "^17.0.0-next.6",
+    "@igo2/auth": "^17.0.0-next.8",
+    "@igo2/common": "^17.0.0-next.8",
+    "@igo2/core": "^17.0.0-next.8",
+    "@igo2/utils": "^17.0.0-next.8",
     "@mat-datetimepicker/core": "~13.0.0",
     "file-saver": "^2.0.2",
     "flexsearch": "0.7.21",
@@ -65,7 +65,7 @@
     "moment": "^2.29.4",
     "ngx-color-picker": "^14.0.0",
     "ngx-indexed-db": "^11.0.2",
-    "ol": "^9.0.0",
+    "ol": "9.1.0",
     "ol-mapbox-style": "^12.0.0",
     "proj4": "^2.9.0",
     "rxjs": "^7.8.0",