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

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

@@ -1,5 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { TimeFilterOptions } from '../../filter/shared/time-filter.interface';
 import type { LegendOptions } from '../../layer/shared/layers/legend.interface';
 import { MapService } from '../../map/shared/map.service';
 import { TypeCapabilitiesStrings } from './capabilities.interface';
@@ -28,7 +29,7 @@ export declare class CapabilitiesService {
     private parseArcgisOptions;
     private parseTileOrImageArcgisOptions;
     private findDataSourceInCapabilities;
-    getTimeFilter(layer: any): any;
+    getTimeFilter(layer: any): TimeFilterOptions;
     getStyle(Style: any): LegendOptions;
     static ɵfac: i0.ɵɵFactoryDeclaration<CapabilitiesService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<CapabilitiesService>;

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

@@ -19,6 +19,7 @@ export declare class WMSDataSource extends DataSource {
     protected wfsService: WFSService;
     ol: olSourceImageWMS;
     get params(): any;
+    set stylesParams(value: string);
     get queryTitle(): string;
     get mapLabel(): string;
     get queryHtmlTarget(): string;
@@ -29,6 +30,7 @@ export declare class WMSDataSource extends DataSource {
     readonly timeFilter$: BehaviorSubject<TimeFilterOptions>;
     get saveableOptions(): Partial<WMSDataSourceOptions>;
     constructor(options: WMSDataSourceOptions, wfsService: WFSService);
+    private dateFormat;
     refresh(): void;
     private buildDynamicDownloadUrlFromParamsWFS;
     protected createOlSource(): olSourceImageWMS;

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

@@ -29,6 +29,7 @@ export interface WMSDataSourceOptionsParams {
     DPI?: number;
     MAP_RESOLUTION?: number;
     FORMAT_OPTIONS?: string;
+    STYLES?: string;
 }
 export interface TimeFilterableDataSourceOptions extends WMSDataSourceOptions {
     timeFilterable?: boolean;

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 { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
+import { IOgcFiltersOption, 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";
@@ -17,7 +17,7 @@ export declare const jsonRegex: RegExp;
  * @param ogcFilters  OgcFiltersOptions
  * @returns A string representing the datasource options, based on filter and views
  */
-export declare function buildUrl(options: WFSDataSourceOptions, extent: Extent, proj: olProjection, ogcFilters: OgcFiltersOptions, randomParam?: boolean): string;
+export declare function buildUrl(options: WFSDataSourceOptions, extent: Extent, proj: olProjection, randomParam?: boolean): string;
 /**
  * This method build/standardize WFS call query params based on the layer property.
  * @param wfsDataSourceOptions  WFSDataSourceOptions The common wfs datasource options interface
@@ -40,3 +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;

package/lib/filter/ogc-filter-time/ogc-filter-time.component.d.ts

@@ -82,6 +82,7 @@ export declare class OgcFilterTimeComponent implements OnInit {
     getDateFromStringWithoutTime(stringDate: string): Date;
     resetFilter(): void;
     toggleFilterState(): void;
+    private isValidDate;
     static ɵfac: i0.ɵɵFactoryDeclaration<OgcFilterTimeComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<OgcFilterTimeComponent, "igo-ogc-filter-time", never, { "datasource": { "alias": "datasource"; "required": false; }; "currentFilter": { "alias": "currentFilter"; "required": false; }; }, { "changeProperty": "changeProperty"; }, never, never, true, never>;
 }

package/lib/filter/shared/date.utils.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @param date: string
+ * @example date = <[2014-08-25, 2018-08-25]>
+ * @example date = 2014-08-25, 2018-08-25
+ * @example date = 2014-08-25/ 2018-08-25
+ * @example date = 2014-08-25
+ */
+export declare function parseDateString(date: string | [min: string, max: string]): Date | [min: Date, max: Date] | undefined;
+export declare function isDateOrRangeInRange(dateOrRange: Date | [min: Date, max: Date], [min, max]: [min: Date, max: Date]): boolean;

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

@@ -0,0 +1,26 @@
+import { AnyBaseOgcFilterOptions, IgoLogicalArrayOptions, OgcFilterConditionsArrayOptions, OgcFilterSpatialOptions } from './ogc-filter.interface';
+export declare const TimeFrame: readonly ["now", "today"];
+export type TimeFrame = (typeof TimeFrame)[number];
+export declare const TimeUnit: readonly ["years", "months", "weeks", "days", "hours", "seconds"];
+export type TimeUnit = (typeof TimeUnit)[number];
+export declare const ArithmeticSymbol: readonly ["+", "-"];
+export type ArithmeticSymbol = (typeof ArithmeticSymbol)[number];
+/**
+ * this function to parse date with specific format
+ * exemple 'today' or 'today + 1 days' or 'now + 1 years'
+ * @param value string date
+ * @returns date
+ */
+export declare function parseDateOperation(dateOperation: string): string;
+export declare function isIgoLogicalArray(filters: IgoLogicalArrayOptions | AnyBaseOgcFilterOptions): filters is IgoLogicalArrayOptions;
+export declare function isFilterAttributeOptions(filters: AnyBaseOgcFilterOptions): filters is Exclude<AnyBaseOgcFilterOptions & {
+    filterid?: string;
+}, OgcFilterConditionsArrayOptions | OgcFilterSpatialOptions>;
+/**
+ * Recursive
+ * Search inside filters of OgcFiltersOptions
+ */
+export declare function searchFilter(filters: IgoLogicalArrayOptions | AnyBaseOgcFilterOptions, key: 'propertyName' | 'filterid', value: string): ((IgoLogicalArrayOptions | AnyBaseOgcFilterOptions) & {
+    filterid?: string;
+}) | undefined;
+export declare function isTimeFrame(value: string): boolean;

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

@@ -27,11 +27,4 @@ export declare class OgcFilterWriter {
     formatGroupAndFilter(ogcFilters: OgcFiltersOptions, selectors: any): any[];
     formatProcessedOgcFilter(processedFilter: string, layersOrTypenames: string): string;
     parseFilterOptionDate(value: string, defaultValue?: string): string;
-    /**
-     * this function to parse date with specific format
-     * exemple 'today + 1 days' or 'now + 1 years'
-     * @param value string date
-     * @returns date
-     */
-    private parseDateOperation;
 }

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

@@ -28,7 +28,9 @@ export type IgoOgcFilterObject = IgoLogicalArrayOptions | AnyBaseOgcFilterOption
 export interface OgcFiltersOptions {
     enabled?: boolean;
     editable?: boolean;
-    filters?: IgoLogicalArrayOptions | AnyBaseOgcFilterOptions;
+    filters?: (IgoLogicalArrayOptions | AnyBaseOgcFilterOptions) & {
+        filterid?: string;
+    };
     pushButtons?: IgoOgcSelector;
     checkboxes?: IgoOgcSelector;
     radioButtons?: IgoOgcSelector;
@@ -46,6 +48,7 @@ export interface IgoOgcSelector {
     selectorType: 'pushButton' | 'checkbox' | 'radioButton' | 'select' | 'autocomplete';
     order?: number;
 }
+export declare const OgcSelectorFields: readonly ["pushButtons", "checkboxes", "radioButtons", "select", "autocomplete"];
 export interface SelectorGroup {
     enabled?: boolean;
     title?: string;
@@ -168,7 +171,7 @@ export interface OgcInterfaceFilterOptions {
     end?: string;
     step?: string;
     restrictToStep?: boolean;
-    sliderOptions: SliderOptionsInterface;
+    sliderOptions?: SliderOptionsInterface;
     displayFormat?: string;
     escapeChar?: string;
     expression?: string | number;
@@ -196,3 +199,7 @@ export interface SliderOptionsInterface extends OgcFilterDuringOptions {
     displayFormat?: string;
     enabled?: boolean;
 }
+export interface IOgcFiltersOption 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

@@ -5,6 +5,7 @@ export declare class OGCFilterService {
     filterByOgc(wmsDatasource: WMSDataSource, filterString: string): void;
     setOgcWFSFiltersOptions(wfsDatasource: OgcFilterableDataSource): void;
     setOgcWMSFiltersOptions(wmsDatasource: OgcFilterableDataSource): void;
+    private mergeInterfaceFilters;
     static ɵfac: i0.ɵɵFactoryDeclaration<OGCFilterService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<OGCFilterService>;
 }

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

@@ -3,8 +3,8 @@ export interface TimeFilterOptions {
     min?: string;
     max?: string;
     range?: boolean;
-    value?: string;
-    values?: [string, string];
+    value?: string | [string, string];
+    default?: string | [string, string];
     type?: TimeFilterType;
     format?: string;
     style?: TimeFilterStyle;

package/lib/filter/time-filter-form/time-filter-form.component.d.ts

@@ -24,7 +24,7 @@ export declare class TimeFilterFormComponent implements OnInit {
     layer: Layer;
     options: TimeFilterOptions;
     set currentValue(value: string);
-    change: EventEmitter<Date | [Date, Date]>;
+    dateChange: EventEmitter<Date | [Date, Date]>;
     yearChange: EventEmitter<string | [string, string]>;
     mySlider: any;
     get type(): TimeFilterType;
@@ -35,14 +35,19 @@ export declare class TimeFilterFormComponent implements OnInit {
     get min(): Date;
     get max(): Date;
     get is(): boolean;
+    get allYearsInterval(): string[];
     constructor(dateAdapter: DateAdapter<Date>);
     ngOnInit(): void;
     storeCurrentFilterValue(): void;
-    checkFilterValue(): void;
+    private processSliderValue;
+    private processCalendarYearType;
+    private processCalendarDateType;
+    private getDateValue;
+    private checkCalendarValue;
+    private checkFilterValue;
     handleDateChange(): void;
     handleYearChange(): void;
-    handleListYearChange(): void;
-    handleListYearStartChange(): void;
+    private setUpYearsInterval;
     dateToNumber(date: Date): number;
     setSliderThumbLabel(label: string): void;
     findThumbLabel(test: any[]): any;
@@ -73,5 +78,5 @@ export declare class TimeFilterFormComponent implements OnInit {
      */
     getStepDefinition(step: any): number;
     static ɵfac: i0.ɵɵFactoryDeclaration<TimeFilterFormComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<TimeFilterFormComponent, "igo-time-filter-form", never, { "layer": { "alias": "layer"; "required": false; }; "options": { "alias": "options"; "required": false; }; "currentValue": { "alias": "currentValue"; "required": false; }; }, { "change": "change"; "yearChange": "yearChange"; }, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<TimeFilterFormComponent, "igo-time-filter-form", never, { "layer": { "alias": "layer"; "required": false; }; "options": { "alias": "options"; "required": false; }; "currentValue": { "alias": "currentValue"; "required": false; }; }, { "dateChange": "dateChange"; "yearChange": "yearChange"; }, never, never, true, never>;
 }

package/lib/filter/time-filter-item/time-filter-item.component.d.ts

@@ -19,6 +19,7 @@ export declare class TimeFilterItemComponent implements OnInit, OnDestroy {
     ngOnDestroy(): void;
     handleYearChange(year: string | [string, string]): void;
     handleDateChange(date: Date | [Date, Date]): void;
+    private reformDate;
     private toggleLegend;
     toggleLegendOnClick(): void;
     setVisible(): void;

package/lib/layer/shared/layers/vector-layer.d.ts

@@ -1,6 +1,6 @@
 import { AuthInterceptor } from '@igo2/auth';
 import { MessageService } from '@igo2/core/message';
-import olFeature from 'ol/Feature';
+import OlFeature from 'ol/Feature';
 import { Extent } from 'ol/extent';
 import olLayerVector from 'ol/layer/Vector';
 import olProjection from 'ol/proj/Projection';
@@ -11,8 +11,7 @@ import { FeatureDataSource } from '../../../datasource/shared/datasources/featur
 import { WebSocketDataSource } from '../../../datasource/shared/datasources/websocket-datasource';
 import { WFSDataSource } from '../../../datasource/shared/datasources/wfs-datasource';
 import { WFSDataSourceOptions } from '../../../datasource/shared/datasources/wfs-datasource.interface';
-import type { MapBase } from '../../../map/shared/map.abstract';
-import { MapExtent } from '../../../map/shared/map.interface';
+import type { MapBase, MapExtent } from '../../../map/shared';
 import { GeoDBService } from '../../../offline/geoDB/geoDB.service';
 import { LayerDBService } from '../../../offline/layerDB/layerDB.service';
 import { GeoNetworkService } from '../../../offline/shared/geo-network.service';
@@ -26,10 +25,8 @@ export declare class VectorLayer extends Layer {
     geoDBService?: GeoDBService;
     layerDBService?: LayerDBService;
     type: LayerType;
-    private previousLoadExtent;
-    private previousLoadResolution;
-    private previousOgcFilters;
-    private xhrAccumulator;
+    private lastRequest;
+    private ongoingRequests;
     dataSource: FeatureDataSource | WFSDataSource | ArcGISRestDataSource | WebSocketDataSource | ClusterDataSource;
     options: VectorLayerOptions;
     ol: olLayerVector<olSourceVector>;
@@ -43,21 +40,22 @@ export declare class VectorLayer extends Layer {
     private removeLayerFromIDB;
     private maintainOptionsInIdb;
     private maintainFeaturesInIdb;
-    protected flash(feature: any): void;
+    protected flash(feature: OlFeature): void;
     init(map: MapBase | undefined): void;
     setExtent(extent: MapExtent): void;
     onUnwatch(): void;
     stopAnimation(): void;
     enableTrackFeature(id: string | number): void;
     centerMapOnFeature(id: string | number): void;
-    trackFeature(id: any, feat: any): void;
+    trackFeature(id: string | number, feat: {
+        feature: OlFeature;
+    }): void;
     disableTrackFeature(): void;
     /**
      * Custom loader for a WFS datasource
      * @internal
      * @param vectorSource the vector source to be created
      * @param options olOptions from source
-     * @param interceptor the interceptor of the data
      * @param extent the extent of the requested data
      * @param resolution the current resolution
      * @param proj the projection to retrieve the data
@@ -65,7 +63,10 @@ export declare class VectorLayer extends Layer {
      * @param failure failure callback
      * @param randomParam random parameter to ensure cache is not causing problems in retrieving new data
      */
-    customWFSLoader(vectorSource: olSourceVector, options: WFSDataSourceOptions, interceptor: AuthInterceptor, extent: Extent, resolution: number, proj: olProjection, success: (features: olFeature[]) => void, failure: () => void, randomParam?: boolean): void;
+    customWFSLoader(vectorSource: olSourceVector, options: WFSDataSourceOptions, extent: Extent, resolution: number, proj: olProjection, success: (features: OlFeature[]) => void, failure: () => void, randomParam?: boolean): void;
+    private abortRequests;
+    private getProjection;
+    private batchGetFeatures;
     /**
      * Custom loader to get feature from a WFS datasource
      * @internal
@@ -78,13 +79,13 @@ export declare class VectorLayer extends Layer {
      * @param failure failure callback
      */
     private getFeatures;
+    private removeRequest;
     /**
      * Custom loader for vector layer.
      * @internal
      * @param vectorSource the vector source to be created
      * @param url the url string or function to retrieve the data
      * @param extent the extent of the requested data
-     * @param resolution the current resolution
      * @param projection the projection to retrieve the data
      */
     private customLoader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "19.0.0-next.6",
+  "version": "19.0.0-next.8",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [
@@ -48,10 +48,10 @@
     "@angular/material": "^19.0.0",
     "@angular/material-moment-adapter": "^19.0.0",
     "@angular/platform-browser": "^19.0.0",
-    "@igo2/auth": "^19.0.0-next.6",
-    "@igo2/common": "^19.0.0-next.6",
-    "@igo2/core": "^19.0.0-next.6",
-    "@igo2/utils": "^19.0.0-next.6",
+    "@igo2/auth": "^19.0.0-next.8",
+    "@igo2/common": "^19.0.0-next.8",
+    "@igo2/core": "^19.0.0-next.8",
+    "@igo2/utils": "^19.0.0-next.8",
     "@mat-datetimepicker/core": "^15.0.1",
     "file-saver": "^2.0.2",
     "flexsearch": "0.7.21",