@igo2/geo 19.0.0-next.10 → 19.0.0-next.12

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

@@ -2,6 +2,7 @@ import { AuthInterceptor } from '@igo2/auth';
 import { LanguageService } from '@igo2/core/language';
 import { MessageService } from '@igo2/core/message';
 import { BehaviorSubject, Observable } from 'rxjs';
+import { OGCFilterService } from '../../filter/shared/ogc-filter.service';
 import { CapabilitiesService } from './capabilities.service';
 import { AnyDataSourceOptions, DataSource } from './datasources';
 import { WFSService } from './datasources/wfs.service';
@@ -11,17 +12,19 @@ export declare class DataSourceService {
     private capabilitiesService;
     private optionsService;
     private wfsDataSourceService;
+    private ogcFilterService;
     private languageService;
     private messageService;
     private authInterceptor?;
     datasources$: BehaviorSubject<DataSource[]>;
-    constructor(capabilitiesService: CapabilitiesService, optionsService: OptionsService, wfsDataSourceService: WFSService, languageService: LanguageService, messageService: MessageService, authInterceptor?: AuthInterceptor);
+    constructor(capabilitiesService: CapabilitiesService, optionsService: OptionsService, wfsDataSourceService: WFSService, ogcFilterService: OGCFilterService, languageService: LanguageService, messageService: MessageService, authInterceptor?: AuthInterceptor);
     createAsyncDataSource(context: AnyDataSourceOptions, detailedContextUri?: string): Observable<DataSource>;
     private createOSMDataSource;
     private createFeatureDataSource;
     private createWebSocketDataSource;
     private createWFSDataSource;
     private createWMSDataSource;
+    private normalizeParams;
     private createWMTSDataSource;
     private createXYZDataSource;
     private createTileDebugDataSource;
@@ -31,6 +34,6 @@ export declare class DataSourceService {
     private createTileArcGISRestDataSource;
     private createMVTDataSource;
     private createClusterDataSource;
-    static ɵfac: i0.ɵɵFactoryDeclaration<DataSourceService, [null, { optional: true; }, null, null, null, null]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<DataSourceService, [null, { optional: true; }, null, null, null, null, null]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<DataSourceService>;
 }

package/lib/datasource/shared/datasources/wfs-datasource.d.ts

@@ -7,6 +7,7 @@ import olProjection from 'ol/proj/Projection';
 import olSourceVector from 'ol/source/Vector';
 import { Observable } from 'rxjs';
 import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
+import { OGCFilterService } from '../../../filter/shared/ogc-filter.service';
 import { DataSource } from './datasource';
 import { WFSDataSourceOptions } from './wfs-datasource.interface';
 import { WFSService } from './wfs.service';
@@ -18,12 +19,13 @@ interface FetchFeatureOptions {
 export declare class WFSDataSource extends DataSource {
     options: WFSDataSourceOptions;
     protected wfsService: WFSService;
+    private ogcFilterService;
     private authInterceptor?;
     ol: olSourceVector;
     set ogcFilters(value: OgcFiltersOptions);
     get ogcFilters(): OgcFiltersOptions;
     get saveableOptions(): Partial<WFSDataSourceOptions>;
-    constructor(options: WFSDataSourceOptions, wfsService: WFSService, authInterceptor?: AuthInterceptor);
+    constructor(options: WFSDataSourceOptions, wfsService: WFSService, ogcFilterService: OGCFilterService, authInterceptor?: AuthInterceptor);
     protected createOlSource(): olSourceVector;
     setOgcFilters(ogcFilters: OgcFiltersOptions, triggerEvent?: boolean): void;
     onUnwatch(): void;

package/lib/datasource/shared/datasources/wfs-datasource.interface.d.ts

@@ -1,4 +1,4 @@
-import type { OgcFiltersOptions } from '../../../filter';
+import type { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
 import type { FeatureDataSourceOptions } from './feature-datasource.interface';
 export interface WFSDataSourceOptions extends FeatureDataSourceOptions {
     params: WFSDataSourceOptionsParams;

package/lib/datasource/shared/datasources/wms-datasource.d.ts

@@ -1,6 +1,7 @@
 import olSourceImageWMS from 'ol/source/ImageWMS';
 import { BehaviorSubject } from 'rxjs';
 import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
+import { OGCFilterService } from '../../../filter/shared/ogc-filter.service';
 import { TimeFilterOptions } from '../../../filter/shared/time-filter.interface';
 import { LegendMapViewOptions } from '../../../layer/shared/layers/legend.interface';
 import { DataSource } from './datasource';
@@ -17,6 +18,7 @@ export interface TimeFilterableDataSource extends WMSDataSource {
 export declare class WMSDataSource extends DataSource {
     options: WMSDataSourceOptions;
     protected wfsService: WFSService;
+    private ogcFilterService;
     ol: olSourceImageWMS;
     get params(): any;
     set stylesParams(value: string);
@@ -36,7 +38,7 @@ export declare class WMSDataSource extends DataSource {
      * is enable by default even if the workspace is not use the layer will still be refreshed.
      */
     enableRefresh: boolean;
-    constructor(options: WMSDataSourceOptions, wfsService: WFSService);
+    constructor(options: WMSDataSourceOptions, wfsService: WFSService, ogcFilterService: OGCFilterService);
     private dateFormat;
     addEvents(): void;
     protected createOlSource(): olSourceImageWMS;

package/lib/datasource/shared/datasources/wms-wfs.utils.d.ts

@@ -1,6 +1,6 @@
 import { Extent } from 'ol/extent';
 import olProjection from 'ol/proj/Projection';
-import { IOgcFiltersOption, OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
+import { IOgcFiltersOptionSaveable, OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
 import { WFSDataSourceOptions } from './wfs-datasource.interface';
 import { WMSDataSourceOptions } from './wms-datasource.interface';
 export declare const defaultEpsg = "EPSG:3857";
@@ -40,4 +40,4 @@ export declare function formatWFSQueryString(dataSourceOptions: WFSDataSourceOpt
  */
 export declare function checkWfsParams(wfsDataSourceOptions: any, srcType?: string): any;
 export declare function getFormatFromOptions(options: WFSDataSourceOptions | WMSDataSourceOptions): any;
-export declare function getSaveableOgcParams(options: OgcFiltersOptions): IOgcFiltersOption;
+export declare function getSaveableOgcParams(options: OgcFiltersOptions): IOgcFiltersOptionSaveable;

package/lib/feature/shared/feature.interfaces.d.ts

@@ -3,7 +3,7 @@ import { EntityKey, EntityStoreOptions, EntityStoreStrategyOptions } from '@igo2
 import OlFeature from 'ol/Feature';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
 import OlRenderFeature from 'ol/render/Feature';
-import { GeoJsonGeometryTypes } from 'geojson';
+import { Geometry } from 'geojson';
 import { SourceFieldsOptionsParams } from '../../datasource/shared/datasources';
 import type { VectorLayer } from '../../layer/shared/layers/vector-layer';
 import type { IgoMap } from '../../map/shared/map';
@@ -31,10 +31,9 @@ export interface FeatureMeta {
     excludeAttribute?: string[];
     excludeAttributeOffline?: string[];
 }
-export interface FeatureGeometry {
-    type: GeoJsonGeometryTypes;
-    coordinates: any;
-}
+export type FeatureGeometry = {
+    coordinates: any[];
+} & Geometry;
 export interface FeatureStoreOptions extends EntityStoreOptions {
     map: IgoMap;
     layer?: VectorLayer;

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

@@ -80,7 +80,7 @@ export declare function featuresAreTooDeepInView(viewController: MapViewControll
  * @param scale If this is defined, the original view will be scaled
  *  by that factor before any logic is applied.
  */
-export declare function moveToOlFeatures(viewController: MapViewController, olFeatures: OlFeature<OlGeometry>[], motion?: FeatureMotion, scale?: [number, number, number, number], areaRatio?: number): void;
+export declare function moveToOlFeatures(viewController: MapViewController, olFeatures: OlFeature | OlFeature[], motion?: FeatureMotion, scale?: [number, number, number, number], areaRatio?: number): void;
 /**
  * Hide an OL feature
  * @param olFeature OL feature

package/lib/filter/shared/ogc-filter.interface.d.ts

@@ -199,7 +199,7 @@ export interface SliderOptionsInterface extends OgcFilterDuringOptions {
     displayFormat?: string;
     enabled?: boolean;
 }
-export interface IOgcFiltersOption extends Omit<OgcFiltersOptions, 'interfaceOgcFilters'> {
+export interface IOgcFiltersOptionSaveable extends Omit<OgcFiltersOptions, 'interfaceOgcFilters'> {
     interfaceOgcFilters: IOgcInterfaceFilterOptions[];
 }
 export type IOgcInterfaceFilterOptions = Pick<OgcInterfaceFilterOptions, 'propertyName' | 'begin' | 'end' | 'active' | 'operator' | 'expression'>;

package/lib/filter/shared/ogc-filter.service.d.ts

@@ -1,9 +1,10 @@
-import { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource';
+import type { WFSDataSourceOptions } from '../../datasource/shared/datasources/wfs-datasource.interface';
+import type { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource';
 import { OgcFilterableDataSource } from './ogc-filter.interface';
 import * as i0 from "@angular/core";
 export declare class OGCFilterService {
     filterByOgc(wmsDatasource: WMSDataSource, filterString: string): void;
-    setOgcWFSFiltersOptions(wfsDatasource: OgcFilterableDataSource): void;
+    setOgcWFSFiltersOptions(options: WFSDataSourceOptions): void;
     setOgcWMSFiltersOptions(wmsDatasource: OgcFilterableDataSource): void;
     private mergeInterfaceFilters;
     static ɵfac: i0.ɵɵFactoryDeclaration<OGCFilterService, never>;

package/lib/import-export/shared/export.service.d.ts

@@ -24,7 +24,7 @@ export declare class ExportService {
     private exportAsync;
     protected exportToFile(olFeatures: OlFeature<OlGeometry>[], format: AnyExportFormat, title: string, projectionIn: string, projectionOut: string): Promise<void>;
     private formatFeatures;
-    getFormatter(format: AnyExportFormat): import("ol/format/GML3").default | olformat.GPX | olformat.KML | olformat.GeoJSON<typeof OlFeature>;
+    getFormatter(format: AnyExportFormat): import("ol/format/GML3").default | olformat.GPX | olformat.KML | olformat.GeoJSON<OlFeature<OlGeometry>>;
     exportExcel(map: IgoMap, store: WorkspaceStore, data: ExportOptions): Promise<void>;
     private getTitleFromLayers;
     private getLayerTitleFromId;

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

@@ -7,6 +7,7 @@ import { StorageService } from '@igo2/core/storage';
 import olFeature from 'ol/Feature';
 import GeoJSON from 'ol/format/GeoJSON';
 import WKT from 'ol/format/WKT';
+import type { default as OlGeometry } from 'ol/geom/Geometry';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { RelationOptions } from '../../datasource/shared/datasources';
 import { ImageLayer, LayerService, VectorLayer } from '../../layer/shared';
@@ -29,7 +30,7 @@ export declare class EditionWorkspaceService {
     rowsInMapExtentCheckCondition$: BehaviorSubject<boolean>;
     loading: boolean;
     wktFormat: WKT;
-    geoJsonFormat: GeoJSON<typeof olFeature>;
+    geoJsonFormat: GeoJSON<olFeature<OlGeometry>>;
     get zoomAuto(): boolean;
     constructor(layerService: LayerService, storageService: StorageService, configService: ConfigService, messageService: MessageService, http: HttpClient, dialog: MatDialog, styleService: StyleService, authInterceptor?: AuthInterceptor);
     createWorkspace(layer: ImageLayer, map: IgoMap): EditionWorkspace;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "19.0.0-next.10",
+  "version": "19.0.0-next.12",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [
@@ -32,13 +32,23 @@
     }
   },
   "dependencies": {
-    "@turf/helpers": "^6.5.0",
-    "@turf/line-intersect": "^6.5.0",
-    "@turf/point-on-feature": "^6.5.0",
+    "@mat-datetimepicker/core": "^15.0.1",
+    "@turf/helpers": "^7.2.0",
+    "@turf/line-intersect": "^7.2.0",
+    "@turf/point-on-feature": "^7.2.0",
+    "file-saver": "^2.0.2",
+    "flexsearch": "0.7.21",
+    "html2canvas": "^1.4.1",
+    "jspdf-autotable": "^5.0.0",
+    "jspdf": "^3.0.0",
+    "jszip": "^3.10.1",
+    "moment": "^2.30.0",
+    "ngx-indexed-db": "^19.0.0",
     "nosleep.js": "^0.12.0",
+    "striptags": "^3.2.0",
     "ts-cacheable": "^1.0.6",
     "ts-md5": "^1.3.0",
-    "tslib": "^2.6.0"
+    "tslib": "^2.8.0"
   },
   "peerDependencies": {
     "@angular/animations": "^19.0.0",
@@ -48,24 +58,14 @@
     "@angular/material": "^19.0.0",
     "@angular/material-moment-adapter": "^19.0.0",
     "@angular/platform-browser": "^19.0.0",
-    "@igo2/auth": "^19.0.0-next.10",
-    "@igo2/common": "^19.0.0-next.10",
-    "@igo2/core": "^19.0.0-next.10",
-    "@igo2/utils": "^19.0.0-next.10",
-    "@mat-datetimepicker/core": "^15.0.1",
-    "file-saver": "^2.0.2",
-    "flexsearch": "0.7.21",
-    "html2canvas": "^1.4.1",
-    "jspdf": "^3.0.0",
-    "jspdf-autotable": "^5.0.0",
-    "jszip": "^3.10.1",
-    "moment": "^2.30.0",
-    "ngx-indexed-db": "^19.0.0",
-    "ol": "9.1.0",
-    "ol-mapbox-style": "^12.0.0",
-    "proj4": "^2.12.0",
-    "rxjs": "^7.8.0",
-    "striptags": "^3.2.0"
+    "@igo2/auth": "^19.0.0-next.12",
+    "@igo2/common": "^19.0.0-next.12",
+    "@igo2/core": "^19.0.0-next.12",
+    "@igo2/utils": "^19.0.0-next.12",
+    "ol-mapbox-style": "^12.5.0",
+    "ol": "10.5.0",
+    "proj4": "^2.15.0",
+    "rxjs": "^7.8.0"
   },
   "engines": {
     "node": "^18.19.1 || ^20.11.1 || >=22.0.0"

package/style/style.css

@@ -347,4 +347,8 @@
 
 .ol-overviewmap .ol-overviewmap-box:hover {
   cursor: move;
+}
+
+.ol-overviewmap .ol-viewport:hover {
+  cursor: pointer;
 }