@igo2/geo 1.13.2 → 1.13.4

package/lib/draw/draw/draw-layer-popup.component.d.ts

@@ -0,0 +1,14 @@
+import { MatDialogRef } from '@angular/material/dialog';
+import * as i0 from "@angular/core";
+export interface DialogData {
+    label: string;
+}
+export declare class DrawLayerPopupComponent {
+    dialogRef: MatDialogRef<DrawLayerPopupComponent>;
+    confirmFlag: boolean;
+    constructor(dialogRef: MatDialogRef<DrawLayerPopupComponent>);
+    cancelDrawing(): void;
+    confirm(labelString: string): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<DrawLayerPopupComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<DrawLayerPopupComponent, "igo-draw-popup-component", never, { "confirmFlag": "confirmFlag"; }, {}, never, never, false>;
+}

package/lib/draw/draw/draw.component.d.ts

@@ -1,4 +1,4 @@
-import { OnInit, OnDestroy } from '@angular/core';
+import { OnInit, OnDestroy, EventEmitter } from '@angular/core';
 import { FeatureStore } from '../../feature';
 import { LanguageService } from '@igo2/core';
 import { MatDialog } from '@angular/material/dialog';
@@ -7,6 +7,7 @@ import { IgoMap } from '../../map/shared/map';
 import { BehaviorSubject } from 'rxjs';
 import { Draw, FeatureWithDraw } from '../shared/draw.interface';
 import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
+import { VectorLayer } from '../../layer/shared/layers/vector-layer';
 import { DrawControl } from '../../geometry/shared/controls/draw';
 import { EntityTableTemplate } from '@igo2/common';
 import type { Type } from 'ol/geom/Geometry';
@@ -25,19 +26,31 @@ export declare class DrawComponent implements OnInit, OnDestroy {
      */
     tableTemplate: EntityTableTemplate;
     geometryType: typeof GeometryType;
+    map: IgoMap;
+    get stores(): FeatureStore<FeatureWithDraw>[];
+    set stores(value: FeatureStore<FeatureWithDraw>[]);
+    private _stores;
+    get drawControls(): [string, DrawControl][];
+    set drawControls(value: [string, DrawControl][]);
+    private _drawControls;
+    get activeDrawingLayer(): VectorLayer;
+    set activeDrawingLayer(value: VectorLayer);
+    private _activeDrawingLayer;
+    activeLayerChange: EventEmitter<VectorLayer>;
+    drawControlsEvent: EventEmitter<[string, DrawControl][]>;
+    layersIDEvent: EventEmitter<string>;
     fillColor: string;
     strokeColor: string;
     strokeWidth: number;
     fontSize: string;
     fontStyle: string;
-    map: IgoMap;
-    store: FeatureStore<FeatureWithDraw>;
+    activeStore: FeatureStore<FeatureWithDraw>;
+    private layerCounterID;
     draw$: BehaviorSubject<Draw>;
-    private olDrawingLayerSource;
-    private drawControl;
+    private activeDrawingLayerSource;
+    private activeDrawControl;
     private drawEnd$$;
     private drawSelect$$;
-    private olDrawingLayer;
     selectedFeatures$: BehaviorSubject<FeatureWithDraw[]>;
     fillForm: string;
     strokeForm: string;
@@ -50,6 +63,9 @@ export declare class DrawComponent implements OnInit, OnDestroy {
     icons: Array<string>;
     icon: string;
     private numberOfDrawings;
+    isCreatingNewLayer: boolean;
+    private currGeometryType;
+    select: any;
     constructor(languageService: LanguageService, formBuilder: UntypedFormBuilder, drawStyleService: DrawStyleService, dialog: MatDialog, drawIconService: DrawIconService);
     ngOnInit(): void;
     /**
@@ -93,6 +109,7 @@ export declare class DrawComponent implements OnInit, OnDestroy {
      */
     private addFeatureToStore;
     private buildForm;
+    setupLayer(isNewLayer?: boolean): void;
     /**
      * Called when the user double-clicks the selected drawing
      */
@@ -108,6 +125,11 @@ export declare class DrawComponent implements OnInit, OnDestroy {
      * @internal
      */
     onToggleDrawControl(toggleIsChecked: boolean): void;
+    /**
+     * Display the current layer with the current store and the current layerSource
+     */
+    onLayerChange(currLayer?: VectorLayer): void;
+    createLayer(newTitle?: any, isNewLayer?: any): void;
     /**
      * Called when the user changes the color in a color picker
      * @param labelsAreShown wheter the labels are shown or not
@@ -145,10 +167,16 @@ export declare class DrawComponent implements OnInit, OnDestroy {
     private updateFontSizeAndStyle;
     private updateFillAndStrokeColor;
     private updateOffset;
-    /**
-     * Check the amount of rows as a possible alternative
-     */
+    getFeatureFontSize(): string;
+    getFeatureFontStyle(): string;
+    getFeatureFillColor(): string;
+    getFeatureStrokeColor(): string;
+    getFeatureOffsetX(): number;
+    getFeatureOffsetY(): number | "0";
+    get allFontStyles(): string[];
+    get allLayers(): import("@igo2/geo").Layer[];
     updateHeightTable(): void;
+    updateActiveLayer(): import("@igo2/geo").Layer;
     /**
      * Activate the correct control
      */
@@ -177,5 +205,5 @@ export declare class DrawComponent implements OnInit, OnDestroy {
      */
     private elementStyle;
     static ɵfac: i0.ɵɵFactoryDeclaration<DrawComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<DrawComponent, "igo-draw", never, { "map": "map"; "store": "store"; }, { "fillColor": "fillColor"; "strokeColor": "strokeColor"; "strokeWidth": "strokeWidth"; "fontSize": "fontSize"; "fontStyle": "fontStyle"; }, never, never, false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<DrawComponent, "igo-draw", never, { "map": "map"; "stores": "stores"; "drawControls": "drawControls"; "activeDrawingLayer": "activeDrawingLayer"; }, { "activeLayerChange": "activeLayerChange"; "drawControlsEvent": "drawControlsEvent"; "layersIDEvent": "layersIDEvent"; "fillColor": "fillColor"; "strokeColor": "strokeColor"; "strokeWidth": "strokeWidth"; "fontSize": "fontSize"; "fontStyle": "fontStyle"; }, never, never, false>;
 }

package/lib/draw/draw/draw.module.d.ts

@@ -1,31 +1,32 @@
 import * as i0 from "@angular/core";
 import * as i1 from "./draw.component";
 import * as i2 from "./draw-popup.component";
-import * as i3 from "./draw-shorcuts.component";
-import * as i4 from "@angular/forms";
-import * as i5 from "@angular/common";
-import * as i6 from "@angular/material/button";
-import * as i7 from "@angular/material/button-toggle";
-import * as i8 from "@angular/material/divider";
-import * as i9 from "@angular/material/form-field";
-import * as i10 from "@angular/material/icon";
-import * as i11 from "@angular/material/badge";
-import * as i12 from "@angular/material/tooltip";
-import * as i13 from "@angular/material/input";
-import * as i14 from "@angular/material/list";
-import * as i15 from "@angular/material/select";
-import * as i16 from "@angular/material/slide-toggle";
-import * as i17 from "@angular/material/dialog";
-import * as i18 from "@igo2/core";
-import * as i19 from "@igo2/common";
-import * as i20 from "ngx-color-picker";
-import * as i21 from "@angular/platform-browser";
-import * as i22 from "@angular/platform-browser/animations";
+import * as i3 from "./draw-layer-popup.component";
+import * as i4 from "./draw-shorcuts.component";
+import * as i5 from "@angular/forms";
+import * as i6 from "@angular/common";
+import * as i7 from "@angular/material/button";
+import * as i8 from "@angular/material/button-toggle";
+import * as i9 from "@angular/material/divider";
+import * as i10 from "@angular/material/form-field";
+import * as i11 from "@angular/material/icon";
+import * as i12 from "@angular/material/badge";
+import * as i13 from "@angular/material/tooltip";
+import * as i14 from "@angular/material/input";
+import * as i15 from "@angular/material/list";
+import * as i16 from "@angular/material/select";
+import * as i17 from "@angular/material/slide-toggle";
+import * as i18 from "@angular/material/dialog";
+import * as i19 from "@igo2/core";
+import * as i20 from "@igo2/common";
+import * as i21 from "ngx-color-picker";
+import * as i22 from "@angular/platform-browser";
+import * as i23 from "@angular/platform-browser/animations";
 /**
  * @ignore
  */
 export declare class IgoDrawModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<IgoDrawModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<IgoDrawModule, [typeof i1.DrawComponent, typeof i2.DrawPopupComponent, typeof i3.DrawShorcutsComponent], [typeof i4.FormsModule, typeof i4.ReactiveFormsModule, typeof i5.CommonModule, typeof i6.MatButtonModule, typeof i7.MatButtonToggleModule, typeof i8.MatDividerModule, typeof i9.MatFormFieldModule, typeof i10.MatIconModule, typeof i11.MatBadgeModule, typeof i12.MatTooltipModule, typeof i9.MatFormFieldModule, typeof i13.MatInputModule, typeof i14.MatListModule, typeof i15.MatSelectModule, typeof i16.MatSlideToggleModule, typeof i17.MatDialogModule, typeof i18.IgoLanguageModule, typeof i19.IgoEntityTableModule, typeof i20.ColorPickerModule, typeof i21.BrowserModule, typeof i22.BrowserAnimationsModule], [typeof i1.DrawComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<IgoDrawModule, [typeof i1.DrawComponent, typeof i2.DrawPopupComponent, typeof i3.DrawLayerPopupComponent, typeof i4.DrawShorcutsComponent], [typeof i5.FormsModule, typeof i5.ReactiveFormsModule, typeof i6.CommonModule, typeof i7.MatButtonModule, typeof i8.MatButtonToggleModule, typeof i9.MatDividerModule, typeof i10.MatFormFieldModule, typeof i11.MatIconModule, typeof i12.MatBadgeModule, typeof i13.MatTooltipModule, typeof i10.MatFormFieldModule, typeof i14.MatInputModule, typeof i15.MatListModule, typeof i16.MatSelectModule, typeof i17.MatSlideToggleModule, typeof i18.MatDialogModule, typeof i19.IgoLanguageModule, typeof i20.IgoEntityTableModule, typeof i21.ColorPickerModule, typeof i22.BrowserModule, typeof i23.BrowserAnimationsModule], [typeof i1.DrawComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<IgoDrawModule>;
 }

package/lib/draw/shared/draw.interface.d.ts

@@ -1,5 +1,7 @@
 import { Feature } from '../../feature/shared/feature.interfaces';
 import { IgoMap } from '../../map/shared/map';
+import { DrawControl } from '../../geometry/shared/controls/draw';
+import { FeatureStore } from '../../feature';
 export interface DrawOptions {
     icons?: string[];
 }
@@ -28,3 +30,7 @@ export interface FeatureWithDrawProperties {
 export interface FeatureStoreDrawStrategyOptions {
     map: IgoMap;
 }
+export interface StoreAndDrawControl {
+    store: FeatureStore<FeatureWithDraw>;
+    drawControl: DrawControl;
+}

package/lib/feature/feature-details/feature-details.component.d.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, EventEmitter, OnInit, OnDestroy } from '@angular/core';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
-import { NetworkService, MessageService, LanguageService } from '@igo2/core';
+import { NetworkService, MessageService } from '@igo2/core';
 import { ConfigService } from '@igo2/core';
 import type { Toolbox } from '@igo2/common';
 import { Feature } from '../shared';
@@ -14,7 +14,6 @@ export declare class FeatureDetailsComponent implements OnInit, OnDestroy {
     private sanitizer;
     private networkService;
     private messageService;
-    private languageService;
     private configService;
     private state;
     private unsubscribe$;
@@ -38,7 +37,7 @@ export declare class FeatureDetailsComponent implements OnInit, OnDestroy {
      * @internal
      */
     get icon(): string;
-    constructor(http: HttpClient, cdRef: ChangeDetectorRef, sanitizer: DomSanitizer, networkService: NetworkService, messageService: MessageService, languageService: LanguageService, configService: ConfigService);
+    constructor(http: HttpClient, cdRef: ChangeDetectorRef, sanitizer: DomSanitizer, networkService: NetworkService, messageService: MessageService, configService: ConfigService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     urlSanitizer(value: any): SafeResourceUrl;

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

@@ -3,4 +3,5 @@ export interface ImportExportServiceOptions {
     clientSideFileSizeMaxMb?: number;
     forceNaming?: boolean;
     formats?: string[];
+    configFileToGeoDBService?: string;
 }

package/ngcc.config.js

@@ -1,3 +1,3 @@
-module.exports = {
-  ignorableDeepImportMatchers: [/ol\//, /ol-mapbox-style\//]
-};
+module.exports = {
+  ignorableDeepImportMatchers: [/ol\//, /ol-mapbox-style\//]
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "1.13.2",
+  "version": "1.13.4",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [
@@ -31,9 +31,9 @@
     "@angular/core": "^14.1.2",
     "@angular/forms": "^14.1.2",
     "@angular/material": "^14.1.2",
-    "@igo2/common": "^1.13.2",
-    "@igo2/core": "^1.13.2",
-    "@igo2/utils": "^1.13.2",
+    "@igo2/common": "^1.13.4",
+    "@igo2/core": "^1.13.4",
+    "@igo2/utils": "^1.13.4",
     "ol": "^7.1.0",
     "proj4": "^2.8.0",
     "rxjs": "^7.5.6",

package/style/geo.theming.scss

@@ -1,12 +1,12 @@
-@import '~ol/ol.css';
-
-@mixin igo-geo-theming($theme, $typography) {
-  @include igo-drawingTool-theming($theme, $typography);
-  @include igo-feature-theming($theme);
-  @include igo-filter-theming($theme, $typography);
-  @include igo-layer-theming($theme);
-  @include igo-map-theming($theme, $typography);
-  @include igo-measure-theming($theme, $typography);
-  @include igo-directions-theming($theme);
-  @include igo-workspace-theming($theme, $typography);
-}
+@import '~ol/ol.css';
+
+@mixin igo-geo-theming($theme, $typography) {
+  @include igo-drawingTool-theming($theme, $typography);
+  @include igo-feature-theming($theme);
+  @include igo-filter-theming($theme, $typography);
+  @include igo-layer-theming($theme);
+  @include igo-map-theming($theme, $typography);
+  @include igo-measure-theming($theme, $typography);
+  @include igo-directions-theming($theme);
+  @include igo-workspace-theming($theme, $typography);
+}