@igo2/geo 19.0.0-next.26 → 19.0.0-next.28

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

@@ -4,7 +4,6 @@ import { MessageService } from '@igo2/core/message';
 import { Observable } from 'rxjs';
 import { DataSourceService } from '../../datasource/shared/datasource.service';
 import { AnyDataSourceOptions, AnyDataSourceOptionsWithParams, ArcGISRestDataSourceOptions, WMTSDataSourceOptions } from '../../datasource/shared/datasources';
-import { LayerDBService } from '../../offline/layerDB/layerDB.service';
 import { GeoNetworkService } from '../../offline/shared/geo-network.service';
 import { StyleService } from '../../style/style-service/style.service';
 import { AnyLayer, AnyLayerItemOptions, AnyLayerOptions, Layer, LayerGroupOptions } from './layers';
@@ -16,10 +15,9 @@ export declare class LayerService {
     private dataSourceService;
     private messageService;
     private geoNetworkService?;
-    private layerDBService?;
     private authInterceptor?;
     unavailableLayers: AnyLayerItemOptions[];
-    constructor(http: HttpClient, styleService: StyleService, dataSourceService: DataSourceService, messageService: MessageService, geoNetworkService?: GeoNetworkService, layerDBService?: LayerDBService, authInterceptor?: AuthInterceptor);
+    constructor(http: HttpClient, styleService: StyleService, dataSourceService: DataSourceService, messageService: MessageService, geoNetworkService?: GeoNetworkService, authInterceptor?: AuthInterceptor);
     createLayers(layersOption: AnyLayerOptions[], contextUri?: string): Observable<(AnyLayer | undefined)[]>;
     createLayer(layerOptions: AnyLayerItemOptions): Layer;
     createAsyncLayer(options: AnyLayerItemOptions, detailedContextUri?: string): Observable<Layer | undefined>;
@@ -37,6 +35,6 @@ export declare class LayerService {
     deleteUnavailableLayers(anyLayerOptions: AnyLayerItemOptions): void;
     sourceOptionsWithParams(sourceOptions: AnyDataSourceOptions): sourceOptions is AnyDataSourceOptionsWithParams;
     sourceOptionsWithLayer(sourceOptions: AnyDataSourceOptions): sourceOptions is ArcGISRestDataSourceOptions | WMTSDataSourceOptions;
-    static ɵfac: i0.ɵɵFactoryDeclaration<LayerService, [null, null, null, null, { optional: true; }, { optional: true; }, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LayerService, [null, null, null, null, { optional: true; }, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<LayerService>;
 }

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

@@ -12,8 +12,6 @@ import { WebSocketDataSource } from '../../../datasource/shared/datasources/webs
 import { WFSDataSource } from '../../../datasource/shared/datasources/wfs-datasource';
 import { WFSDataSourceOptions } from '../../../datasource/shared/datasources/wfs-datasource.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';
 import { Layer } from './layer';
 import { LayerType } from './layer.interface';
@@ -22,8 +20,6 @@ export declare class VectorLayer extends Layer {
     messageService?: MessageService;
     authInterceptor?: AuthInterceptor;
     private geoNetworkService?;
-    geoDBService?: GeoDBService;
-    layerDBService?: LayerDBService;
     type: LayerType;
     private lastRequest;
     private ongoingRequests;
@@ -34,8 +30,10 @@ export declare class VectorLayer extends Layer {
     private trackFeatureListenerId;
     get browsable(): boolean;
     get exportable(): boolean;
-    constructor(options: VectorLayerOptions, messageService?: MessageService, authInterceptor?: AuthInterceptor, geoNetworkService?: GeoNetworkService, geoDBService?: GeoDBService, layerDBService?: LayerDBService);
+    constructor(options: VectorLayerOptions, messageService?: MessageService, authInterceptor?: AuthInterceptor, geoNetworkService?: GeoNetworkService);
     protected createOlLayer(): olLayerVector<olSourceVector>;
+    private handleIdbStorage;
+    private handlePreload;
     remove(): void;
     private removeLayerFromIDB;
     private maintainOptionsInIdb;
@@ -80,6 +78,7 @@ export declare class VectorLayer extends Layer {
      */
     private getFeatures;
     private removeRequest;
+    private handleOnLoad;
     /**
      * Custom loader for vector layer.
      * @internal
@@ -89,14 +88,4 @@ export declare class VectorLayer extends Layer {
      * @param projection the projection to retrieve the data
      */
     private customLoader;
-    /**
-     * Custom loader for vector layer.
-     * @internal
-     * @param vectorSource the vector source to be created
-     * @param layerID 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 customIDBLoader;
 }

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

@@ -32,8 +32,9 @@ export interface VectorLayerOptions extends LayerOptions {
 }
 export interface IdbInfo {
     storeToIdb: boolean;
-    contextUri: string;
-    firstLoad: boolean;
+    contextUri?: string;
+    /** Interface restricted for system usage. You don't need to set a value */
+    firstLoad?: boolean;
 }
 export interface VectorAnimation {
     duration?: number;

package/lib/offline/geoDB/configFileToGeoDB.service.d.ts

@@ -1,13 +1,11 @@
 import { HttpClient } from '@angular/common/http';
 import { MessageService } from '@igo2/core/message';
-import { GeoDBService } from './geoDB.service';
 import * as i0 from "@angular/core";
 export declare class ConfigFileToGeoDBService {
     private http;
-    private geoDBService;
     private messageService;
-    constructor(http: HttpClient, geoDBService: GeoDBService, messageService: MessageService);
-    load(url: string): void;
+    constructor(http: HttpClient, messageService: MessageService);
+    load(urlFile: string): void;
     private isZip;
     static ɵfac: i0.ɵɵFactoryDeclaration<ConfigFileToGeoDBService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<ConfigFileToGeoDBService>;

package/lib/offline/geoDB/geoDB.d.ts

@@ -0,0 +1,36 @@
+import { Observable } from 'rxjs';
+import { InsertSourceInsertDBEnum } from './geoDB.enums';
+import { GeoDBData } from './geoDB.interface';
+export declare class GeoDB {
+    private db$;
+    private compression;
+    collisionsMap: Map<string | number, string[]>;
+    _newData: number;
+    private revertObservablesSubscription;
+    constructor();
+    /**
+     * Only blob can be compressed
+     * @param url
+     * @param regionID
+     * @param object object to handle
+     * @param insertSource type of event user or system
+     * @param insertEvent Name of the event where the insert has been triggered
+     * @returns
+     */
+    update(url: string, regionID: number | string, object: object | Blob, insertSource: InsertSourceInsertDBEnum, insertEvent: string): Observable<GeoDBData>;
+    private customUpdate;
+    add(geoDBData: GeoDBData): Observable<GeoDBData>;
+    put(geoDBData: GeoDBData): Observable<GeoDBData>;
+    getGeoDBData(url: string): Observable<GeoDBData>;
+    get(url: string): Observable<object | Blob>;
+    delete(key: string): Observable<object>;
+    /** @deprecated Use delete method instead*/
+    deleteByKey(key: string): Observable<object>;
+    getRegionCountByID(id: number): Observable<number>;
+    getRegionByID(id: number): Observable<GeoDBData[]>;
+    deleteByRegionID(id: number): Observable<void[]>;
+    resetCounters(): void;
+    resetCollisionsMap(): void;
+    revertCollisions(): void;
+    get newData(): number;
+}

package/lib/offline/geoDB/index.d.ts

@@ -1,4 +1,4 @@
 export * from './geoDB.enums';
 export * from './geoDB.interface';
-export * from './geoDB.service';
+export * from './geoDB';
 export * from './configFileToGeoDB.service';

package/lib/offline/layerDB/index.d.ts

@@ -1,2 +1,2 @@
 export * from './layerDB.interface';
-export * from './layerDB.service';
+export * from './layerDB';

package/lib/offline/layerDB/{layerDB.service.d.ts → layerDB.d.ts}

@@ -1,18 +1,16 @@
-import { NgxIndexedDBService } from 'ngx-indexed-db';
 import { Observable } from 'rxjs';
 import { LayerDBData } from './layerDB.interface';
-import * as i0 from "@angular/core";
-export declare class LayerDBService {
-    private ngxIndexedDBService;
-    readonly dbName: string;
-    constructor(ngxIndexedDBService: NgxIndexedDBService);
+export declare class LayerDB {
+    private db$;
+    constructor();
     /**
      * This method allow to update the stored layer into the indexeddb (layerData)
      * @param layerDBData
      * @returns
      */
-    update(layerDBData: LayerDBData): Observable<any>;
+    update(layerDBData: LayerDBData): Observable<LayerDBData>;
     private customUpdate;
+    add(layerDBData: LayerDBData): Observable<LayerDBData>;
     /**
      * This method retrieve an idb layer definition
      * @param layerId
@@ -21,16 +19,16 @@ export declare class LayerDBService {
     getByID(layerId: string): Observable<LayerDBData>;
     /**
      * This method delete an idb layer definition
-     * @param layerId
+     * @param key
      * @returns
      */
-    deleteByKey(layerId: string): Observable<void>;
+    delete(key: string): Observable<object>;
+    /** @deprecated Use delete method instead*/
+    deleteByKey(key: string): Observable<object>;
     /**
      * This method retrive all idb layer definition
      * @param layerId
      * @returns
      */
     getAll(): Observable<LayerDBData[]>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<LayerDBService, [{ optional: true; }]>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<LayerDBService>;
 }

package/lib/offline/offline.provider.d.ts

@@ -1,3 +1,5 @@
 import { EnvironmentProviders } from '@angular/core';
 import { IOfflineOptions } from './offline.interface';
+/** Ensure to create the indexDB on app initialisation and provide
+ * GeoNetworkService, ConfigFileToGeoDBService */
 export declare function provideOffline(options: IOfflineOptions): EnvironmentProviders;

package/lib/offline/shared/geo-network.service.d.ts

@@ -2,7 +2,6 @@ import { HttpClient } from '@angular/common/http';
 import { NetworkService } from '@igo2/core/network';
 import { Type } from 'ol/format/Feature';
 import { Observable } from 'rxjs';
-import { GeoDBService } from '../geoDB/geoDB.service';
 import * as i0 from "@angular/core";
 export declare enum ResponseType {
     Arraybuffer = "arraybuffer",
@@ -17,13 +16,12 @@ export interface SimpleGetOptions {
 export declare class GeoNetworkService {
     private http;
     private networkService;
-    geoDBService?: GeoDBService;
     private networkOnline;
-    constructor(http: HttpClient, networkService: NetworkService, geoDBService?: GeoDBService);
+    constructor(http: HttpClient, networkService: NetworkService);
     get(url: string, simpleGetOptions: SimpleGetOptions): Observable<any>;
     private getOnline;
     private getOffline;
     isOnline(): boolean;
-    static ɵfac: i0.ɵɵFactoryDeclaration<GeoNetworkService, [null, null, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<GeoNetworkService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<GeoNetworkService>;
 }

package/lib/offline/shared/indexed-db.interface.d.ts

@@ -0,0 +1,16 @@
+import { DBSchema } from 'idb';
+import { GeoDBData } from '../geoDB/geoDB.interface';
+import { LayerDBData } from '../layerDB/layerDB.interface';
+export interface IgoDBSchema extends DBSchema {
+    geoData: {
+        value: GeoDBData;
+        key: string;
+        indexes: {
+            'regionID-idx': string;
+        };
+    };
+    layerData: {
+        value: LayerDBData;
+        key: string;
+    };
+}

package/lib/offline/shared/indexed-db.utils.d.ts

@@ -0,0 +1,4 @@
+import { IDBPDatabase } from 'idb';
+import { Observable } from 'rxjs';
+import { IgoDBSchema } from './indexed-db.interface';
+export declare function createIndexedDb(): Observable<IDBPDatabase<IgoDBSchema>>;

package/locale/en.geo.json

@@ -527,6 +527,10 @@
             "oldCity": "Old city",
             "mrc": "MRC",
             "regadmin": "Administrative Region",
+            "rss": "Social and health regions (RSS)",
+            "rls": "Local health networks (RLS)",
+            "clsc": "Local community service centers (CLSC)",
+            "tours": "Cooling towers",
             "road": "Road",
             "intersection": "Intersection",
             "place": "Place",

package/locale/fr.geo.json

@@ -526,6 +526,10 @@
             "oldCity": "Ancienne municipalité",
             "mrc": "MRC",
             "regadmin": "Région administrative",
+            "rss": "Régions sociosanitaires (RSS)",
+            "rls": "Réseaux locaux de santé (RLS)",
+            "clsc": "Centres locaux de services communautaires (CLSC)",
+            "tours": "Tours de refroidissement",
             "road": "Route",
             "intersection": "Intersection",
             "place": "Lieu",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "19.0.0-next.26",
+  "version": "19.0.0-next.28",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [
@@ -42,10 +42,10 @@
     "@angular/material-moment-adapter": "^19.0.0",
     "@angular/material": "^19.0.0",
     "@angular/platform-browser": "^19.0.0",
-    "@igo2/auth": "^19.0.0-next.26",
-    "@igo2/common": "^19.0.0-next.26",
-    "@igo2/core": "^19.0.0-next.26",
-    "@igo2/utils": "^19.0.0-next.26",
+    "@igo2/auth": "^19.0.0-next.28",
+    "@igo2/common": "^19.0.0-next.28",
+    "@igo2/core": "^19.0.0-next.28",
+    "@igo2/utils": "^19.0.0-next.28",
     "@mat-datetimepicker/core": "^15.0.1",
     "@turf/boolean-intersects": "^7.2.0",
     "@turf/buffer": "^7.2.0",
@@ -56,11 +56,11 @@
     "file-saver": "^2.0.2",
     "flexsearch": "0.7.21",
     "html2canvas": "^1.4.1",
+    "idb": "^8.0.3",
     "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",
     "ol-mapbox-style": "^12.5.0",
     "ol": "10.5.0",

package/lib/offline/geoDB/geoDB.service.d.ts

@@ -1,36 +0,0 @@
-import { DBMode, NgxIndexedDBService } from 'ngx-indexed-db';
-import { Observable } from 'rxjs';
-import { InsertSourceInsertDBEnum } from './geoDB.enums';
-import * as i0 from "@angular/core";
-export declare class GeoDBService {
-    private ngxIndexedDBService;
-    readonly dbName: string;
-    collisionsMap: Map<number, string[]>;
-    _newData: number;
-    private compression;
-    constructor(ngxIndexedDBService: NgxIndexedDBService);
-    /**
-     * Only blob can be compressed
-     * @param url
-     * @param regionID
-     * @param object object to handle
-     * @param insertSource type of event user or system
-     * @param insertEvent Name of the event where the insert has been triggered
-     * @returns
-     */
-    update(url: string, regionID: any, object: any, insertSource: InsertSourceInsertDBEnum, insertEvent: string): Observable<any>;
-    private customUpdate;
-    get(url: string): Observable<any>;
-    getByID(url: string): Observable<any>;
-    deleteByKey(url: string): Observable<any>;
-    getRegionCountByID(id: number): Observable<number>;
-    getRegionByID(id: number): Observable<any[]>;
-    deleteByRegionID(id: number): Observable<any>;
-    openCursor(keyRange?: IDBKeyRange, mode?: DBMode): Observable<import("ngx-indexed-db").NgxIDBCursorWithValue<unknown, IDBValidKey, IDBValidKey>>;
-    resetCounters(): void;
-    resetCollisionsMap(): void;
-    revertCollisions(): void;
-    get newData(): number;
-    static ɵfac: i0.ɵɵFactoryDeclaration<GeoDBService, [{ optional: true; }]>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<GeoDBService>;
-}