@igo2/geo 18.0.0-next.6 → 18.0.0-next.7

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

@@ -1,9 +1,20 @@
+import type { HttpClient } from '@angular/common/http';
 import { AuthInterceptor } from '@igo2/auth';
+import OlFeature from 'ol/Feature';
+import { Extent } from 'ol/extent';
+import type { default as OlGeometry } from 'ol/geom/Geometry';
+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 { DataSource } from './datasource';
 import { WFSDataSourceOptions } from './wfs-datasource.interface';
 import { WFSService } from './wfs.service';
+interface FetchFeatureOptions {
+    extent: Extent;
+    projection: olProjection;
+    httpClient: HttpClient;
+}
 export declare class WFSDataSource extends DataSource {
     options: WFSDataSourceOptions;
     protected wfsService: WFSService;
@@ -15,4 +26,8 @@ export declare class WFSDataSource extends DataSource {
     protected createOlSource(): olSourceVector;
     setOgcFilters(ogcFilters: OgcFiltersOptions, triggerEvent?: boolean): void;
     onUnwatch(): void;
+    fetchFeatures({ extent, projection, httpClient }: FetchFeatureOptions): Observable<OlFeature<OlGeometry>[]>;
+    private _fetchFeatures;
+    private _parseXmlFeatures;
 }
+export {};

package/lib/import-export/import-export/import-export.component.d.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { MatSlideToggleChange } from '@angular/material/slide-toggle';
 import { ConfirmDialogService } from '@igo2/common/confirm-dialog';
@@ -18,9 +18,10 @@ import { StyleListService } from '../../style/style-list/style-list.service';
 import { StyleService } from '../../style/style-service/style.service';
 import { ExportOptions } from '../shared/export.interface';
 import { ExportService } from '../shared/export.service';
-import { ExportFormat } from '../shared/export.type';
+import { isCsvExport } from '../shared/export.utils';
 import { ImportService } from '../shared/import.service';
 import * as i0 from "@angular/core";
+type SelectMode = 'import' | 'export';
 export declare class ImportExportComponent implements OnDestroy, OnInit {
     private importService;
     private exportService;
@@ -30,23 +31,22 @@ export declare class ImportExportComponent implements OnDestroy, OnInit {
     private styleService;
     private formBuilder;
     private config;
-    private cdRef;
     private storageService;
     private downloadService;
     private layerService;
     private confirmDialogService;
     form: UntypedFormGroup;
     importForm: UntypedFormGroup;
-    formats$: BehaviorSubject<any>;
-    encodings$: BehaviorSubject<any>;
+    formats$: BehaviorSubject<("GeoJSON" | "Excel" | "Shapefile" | "GML" | "GPX" | "KML" | "CSV" | "URL")[]>;
     exportableLayers$: BehaviorSubject<AnyLayer[]>;
     loading$: BehaviorSubject<boolean>;
     forceNaming: boolean;
     controlFormat: string;
+    csvSeparators: readonly ["auto", "comma", "semicolon"];
+    isCsvExport: typeof isCsvExport;
     private layers$$;
     private exportableLayers$$;
     private formats$$;
-    private encodings$$;
     private formLayer$$;
     private exportOptions$$;
     importHtmlClarifications: string;
@@ -57,6 +57,7 @@ export declare class ImportExportComponent implements OnDestroy, OnInit {
     projections$: BehaviorSubject<InputProjections[]>;
     private projectionsConstraints;
     popupChecked: boolean;
+    private configFormats;
     private previousLayerSpecs$;
     selectFirstProj: boolean;
     map: IgoMap;
@@ -68,8 +69,8 @@ export declare class ImportExportComponent implements OnDestroy, OnInit {
      * Store that holds the available workspaces.
      */
     store: WorkspaceStore;
-    selectedMode: string;
-    selectMode: EventEmitter<string>;
+    selectedMode: SelectMode;
+    selectMode: EventEmitter<SelectMode>;
     exportOptions$: BehaviorSubject<ExportOptions>;
     exportOptionsChange: EventEmitter<ExportOptions>;
     get layers(): any;
@@ -78,10 +79,9 @@ export declare class ImportExportComponent implements OnDestroy, OnInit {
     set inputProj(value: any);
     get popupAllowed(): boolean;
     set popupAllowed(value: boolean);
-    constructor(importService: ImportService, exportService: ExportService, languageService: LanguageService, messageService: MessageService, styleListService: StyleListService, styleService: StyleService, formBuilder: UntypedFormBuilder, config: ConfigService, cdRef: ChangeDetectorRef, storageService: StorageService, downloadService: DownloadService, layerService: LayerService, confirmDialogService: ConfirmDialogService);
+    constructor(importService: ImportService, exportService: ExportService, languageService: LanguageService, messageService: MessageService, styleListService: StyleListService, styleService: StyleService, formBuilder: UntypedFormBuilder, config: ConfigService, storageService: StorageService, downloadService: DownloadService, layerService: LayerService, confirmDialogService: ConfirmDialogService);
     ngOnInit(): void;
     private computeProjections;
-    private getWorkspaceByLayerId;
     getLayerTitleById(id: any): string;
     layerHasSelectedFeatures(layer: Layer): boolean;
     onlySelected(event: MatSlideToggleChange, id: string): void;
@@ -91,22 +91,30 @@ export declare class ImportExportComponent implements OnDestroy, OnInit {
     private handlePreviousLayerSpecs;
     importFiles(files: File[]): void;
     handlePopup(preCheck?: boolean): boolean;
-    handleExportFormSubmit(data: ExportOptions): void;
+    private isOgreOrLink;
+    handleExportFormSubmit(data: ExportOptions): Promise<void>;
+    private handleUrlExport;
+    private validateGpxExport;
+    private handleCsvExport;
+    private handleExport;
+    private getAllLayerGeomTypes;
     private createTitleEmptyRows;
     private circleToPoint;
     private buildForm;
+    private handleCsvForm;
     private onFileImportSuccess;
     private onFileImportError;
     private onPopupBlockedError;
     private onFileExportError;
     private loadConfig;
-    encodingDefaultValue(format: ExportFormat): "UTF8" | "LATIN1";
-    private loadEncodings;
     private computeFormats;
+    private getAvailableFormats;
     private validateListFormat;
-    modeChanged(mode: any): void;
+    private compareString;
+    modeChanged(mode: SelectMode): void;
     private onFileExportSuccess;
     onImportExportChange(event: any): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ImportExportComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<ImportExportComponent, "igo-import-export", never, { "selectFirstProj": { "alias": "selectFirstProj"; "required": false; }; "map": { "alias": "map"; "required": false; }; "contextUri": { "alias": "contextUri"; "required": false; }; "projectionsLimitations": { "alias": "projectionsLimitations"; "required": false; }; "store": { "alias": "store"; "required": false; }; "selectedMode": { "alias": "selectedMode"; "required": false; }; "exportOptions$": { "alias": "exportOptions$"; "required": false; }; }, { "selectMode": "selectMode"; "exportOptionsChange": "exportOptionsChange"; }, never, never, true, never>;
 }
+export {};

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

@@ -1,11 +1,18 @@
-import { EncodingFormat, ExportFormat } from './export.type';
+import type { default as OlFeature } from 'ol/Feature';
+import type { Type } from 'ol/geom/Geometry';
+import { AnyExportFormat, CsvSeparator } from './export.type';
 export interface ExportOptions {
-    format?: ExportFormat;
-    encoding?: EncodingFormat;
+    format?: AnyExportFormat;
     layers: string[];
     layersWithSelection?: string[];
     name?: string;
     combineLayers?: boolean;
     separator?: boolean;
+    csvSeparator?: CsvSeparator;
     featureInMapExtent?: boolean;
 }
+export interface GeometryCollection {
+    /** The geometry type */
+    type: Type | null;
+    features: OlFeature[];
+}

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

@@ -1,30 +1,46 @@
+import { HttpClient } from '@angular/common/http';
+import { Workspace, WorkspaceStore } from '@igo2/common/workspace';
 import { ConfigService } from '@igo2/core/config';
 import OlFeature from 'ol/Feature';
+import * as olformat from 'ol/format';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
-import { Observable, Observer } from 'rxjs';
-import { EncodingFormat, ExportFormat } from './export.type';
+import { Observable } from 'rxjs';
+import { AnyLayer } from '../../layer';
+import { IgoMap } from '../../map';
+import { ExportOptions, GeometryCollection } from './export.interface';
+import { AnyExportFormat, ExportOgreFormat } from './export.type';
 import * as i0 from "@angular/core";
 export declare class ExportService {
     private config;
-    static ogreFormats: {
-        GML: string;
-        GPX: string;
-        KML: string;
-        Shapefile: string;
-        CSVcomma: string;
-        CSVsemicolon: string;
-    };
-    static noOgreFallbacks: string[];
+    private httpClient;
+    static ogreFormats: Record<ExportOgreFormat, string>;
+    static noOgreFallbacks: Partial<AnyExportFormat[]>;
     private ogreUrl;
     private aggregateInComment;
-    constructor(config: ConfigService);
-    export(olFeatures: OlFeature<OlGeometry>[], format: ExportFormat, title: string, encoding: EncodingFormat, projectionIn?: string, projectionOut?: string): Observable<void>;
-    generateFeature(olFeatures: OlFeature<OlGeometry>[], format: ExportFormat, excludePrefix?: string): OlFeature<OlGeometry>[];
+    constructor(config: ConfigService, httpClient: HttpClient);
+    export(olFeatures: OlFeature<OlGeometry>[], options: ExportOptions, title: string, projectionIn?: string, projectionOut?: string): Observable<void>;
+    cleanFeatures(olFeatures: OlFeature<OlGeometry>[], format: AnyExportFormat, excludePrefix?: string): OlFeature<OlGeometry>[];
     private generateAggregatedFeature;
     private exportAsync;
-    protected exportToFile(olFeatures: OlFeature<OlGeometry>[], observer: Observer<void>, format: ExportFormat, title: string, projectionIn: string, projectionOut: string): void;
+    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>;
+    exportExcel(map: IgoMap, store: WorkspaceStore, data: ExportOptions): Promise<void>;
+    private getTitleFromLayers;
+    private getLayerTitleFromId;
+    private addExcelSheet;
+    private formatRecord;
+    private formatDataType;
+    private getColumnsInfo;
+    private getColumnMaxWidth;
     private exportWithOgre;
+    private formatFilename;
     private nothingToExport;
+    private getFeaturesFromMap;
+    private getFeaturesFromWorkspace;
+    getFeatures(map: IgoMap, layer: AnyLayer, data: ExportOptions, store: WorkspaceStore): Observable<OlFeature[]>;
+    getWorkspaceByLayerId(id: string, store: WorkspaceStore): Workspace;
+    getGeomTypes(features: OlFeature[], format?: AnyExportFormat): GeometryCollection[];
     static ɵfac: i0.ɵɵFactoryDeclaration<ExportService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<ExportService>;
 }

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

@@ -1,16 +1,8 @@
-export declare const ExportFormat: {
-    URL: "URL";
-    GeoJSON: "GeoJSON";
-    GML: "GML";
-    GPX: "GPX";
-    KML: "KML";
-    Shapefile: "Shapefile";
-    CSVcomma: "CSVcomma";
-    CSVsemicolon: "CSVsemicolon";
-};
-export type ExportFormat = keyof typeof ExportFormat;
-export declare const EncodingFormat: {
-    UTF8: "UTF8";
-    LATIN1: "LATIN1";
-};
-export type EncodingFormat = keyof typeof EncodingFormat;
+export type AnyExportFormat = ExportFormat | ExportFormatLegacy;
+export declare const ExportFormat: readonly ["GeoJSON", "Excel", "Shapefile", "GML", "GPX", "KML", "CSV", "URL"];
+export type ExportFormat = (typeof ExportFormat)[number];
+export declare const ExportFormatLegacy: readonly ["CSVcomma", "CSVsemicolon"];
+export type ExportFormatLegacy = (typeof ExportFormatLegacy)[number];
+export declare const CsvSeparator: readonly ["auto", "comma", "semicolon"];
+export type CsvSeparator = (typeof CsvSeparator)[number];
+export type ExportOgreFormat = Extract<AnyExportFormat, 'GML' | 'GPX' | 'KML' | 'Shapefile' | 'CSVcomma' | 'CSVsemicolon' | 'CSV'>;

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

@@ -1,5 +1,6 @@
 import { EntityTableColumn } from '@igo2/common/entity';
 import { MessageService } from '@igo2/core/message';
+import { AnyExportFormat } from './export.type';
 export declare function handleFileExportError(error: Error, messageService: MessageService): void;
 export declare function handleFileExportSuccess(messageService: MessageService): void;
 export declare function handleNothingToExportError(messageService: MessageService): void;
@@ -17,3 +18,4 @@ export declare function exportToCSV(rows: any[][], fileName: string, separator?:
  * @param scolumns Columns definition of the output data
  */
 export declare function entitiesToRowData(entities: object[], columns: EntityTableColumn[]): any[][];
+export declare function isCsvExport(format: AnyExportFormat): boolean;

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

@@ -66,7 +66,6 @@ export declare class VectorLayer extends Layer {
      * Custom loader to get feature from a WFS datasource
      * @internal
      * @param vectorSource the vector source to be created
-     * @param interceptor the interceptor of the data
      * @param extent the extent of the requested data
      * @param dataProjection the projection of the retrieved data
      * @param featureProjection the projection of the created features
@@ -80,7 +79,6 @@ export declare class VectorLayer extends Layer {
      * @internal
      * @param vectorSource the vector source to be created
      * @param url the url string or function to retrieve the data
-     * @param interceptor the interceptor of the data
      * @param extent the extent of the requested data
      * @param resolution the current resolution
      * @param projection the projection to retrieve the data
@@ -91,7 +89,6 @@ export declare class VectorLayer extends Layer {
      * @internal
      * @param vectorSource the vector source to be created
      * @param layerID the url string or function to retrieve the data
-     * @param interceptor the interceptor of the data
      * @param extent the extent of the requested data
      * @param resolution the current resolution
      * @param projection the projection to retrieve the data

package/locale/en.geo.json

@@ -103,16 +103,21 @@
           "GPX": "GPX",
           "KML": "KML",
           "Shapefile": "Shapefile",
-          "CSVcomma": "CSV (comma delimited)",
-          "CSVsemicolon": "CSV (Excel compatible)",
+          "CSV": "CSV",
+          "Excel": "Excel",
           "URL": "External link"
         },
+        "separator": "Separator",
+        "csv.separator": {
+          "auto": "Auto detection",
+          "comma": "Comma",
+          "semicolon": "Semicolon"
+        },
         "gpx.error.poly": {
           "title": "GPX error",
           "text": "GPX format do now allow polygon features"
         },
         "encoding": {
-          "LATIN1": "LATIN-1",
           "UTF8": "UTF-8"
         },
         "combinedLayers": "combinedLayers"

package/locale/fr.geo.json

@@ -103,16 +103,21 @@
           "GPX": "GPX",
           "KML": "KML",
           "Shapefile": "Shapefile",
-          "CSVcomma": "CSV (séparateur virgule)",
-          "CSVsemicolon": "CSV (compatible Excel)",
+          "CSV": "CSV",
+          "Excel": "Excel",
           "URL": "Lien externe"
         },
+        "separator": "Séparateur",
+        "csv.separator": {
+          "auto": "Détection Automatique",
+          "comma": "Virgule",
+          "semicolon": "Point-virgule"
+        },
         "gpx.error.poly": {
           "title": "GPX en erreur",
           "text": "Le format GPX ne permet pas de stocker les polygones"
         },
         "encoding": {
-          "LATIN1": "LATIN-1",
           "UTF8": "UTF-8"
         },
         "combinedLayers": "couchesCombinees"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "18.0.0-next.6",
+  "version": "18.0.0-next.7",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [
@@ -41,7 +41,7 @@
     "ts-cacheable": "^1.0.6",
     "ts-md5": "^1.3.0",
     "tslib": "^2.6.0",
-    "windows-1252": "^3.0.4"
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
   },
   "peerDependencies": {
     "@angular/animations": "^18.0.0",
@@ -51,10 +51,10 @@
     "@angular/material": "^18.0.0",
     "@angular/material-moment-adapter": "^18.0.0",
     "@angular/platform-browser": "^18.0.0",
-    "@igo2/auth": "^18.0.0-next.6",
-    "@igo2/common": "^18.0.0-next.6",
-    "@igo2/core": "^18.0.0-next.6",
-    "@igo2/utils": "^18.0.0-next.6",
+    "@igo2/auth": "^18.0.0-next.7",
+    "@igo2/common": "^18.0.0-next.7",
+    "@igo2/core": "^18.0.0-next.7",
+    "@igo2/utils": "^18.0.0-next.7",
     "@mat-datetimepicker/core": "~14.0.0",
     "file-saver": "^2.0.2",
     "flexsearch": "0.7.21",

package/src/_index.scss

@@ -1,2 +1,3 @@
-@forward './lib/search/search-bar/search-bar.theming.scss' as search-bar-* show search-bar-color,
+@forward './lib/search/search-bar/search-bar.theming.scss' as search-bar-* show
+    search-bar-color,
   search-bar-density, search-bar-theme;