@igo2/geo 1.13.2 → 1.13.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,14 @@
1
+ import { MatDialogRef } from '@angular/material/dialog';
2
+ import * as i0 from "@angular/core";
3
+ export interface DialogData {
4
+ label: string;
5
+ }
6
+ export declare class DrawLayerPopupComponent {
7
+ dialogRef: MatDialogRef<DrawLayerPopupComponent>;
8
+ confirmFlag: boolean;
9
+ constructor(dialogRef: MatDialogRef<DrawLayerPopupComponent>);
10
+ cancelDrawing(): void;
11
+ confirm(labelString: string): void;
12
+ static ɵfac: i0.ɵɵFactoryDeclaration<DrawLayerPopupComponent, never>;
13
+ static ɵcmp: i0.ɵɵComponentDeclaration<DrawLayerPopupComponent, "igo-draw-popup-component", never, { "confirmFlag": "confirmFlag"; }, {}, never, never, false>;
14
+ }
@@ -1,4 +1,4 @@
1
- import { OnInit, OnDestroy } from '@angular/core';
1
+ import { OnInit, OnDestroy, EventEmitter } from '@angular/core';
2
2
  import { FeatureStore } from '../../feature';
3
3
  import { LanguageService } from '@igo2/core';
4
4
  import { MatDialog } from '@angular/material/dialog';
@@ -7,6 +7,7 @@ import { IgoMap } from '../../map/shared/map';
7
7
  import { BehaviorSubject } from 'rxjs';
8
8
  import { Draw, FeatureWithDraw } from '../shared/draw.interface';
9
9
  import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
10
+ import { VectorLayer } from '../../layer/shared/layers/vector-layer';
10
11
  import { DrawControl } from '../../geometry/shared/controls/draw';
11
12
  import { EntityTableTemplate } from '@igo2/common';
12
13
  import type { Type } from 'ol/geom/Geometry';
@@ -25,19 +26,31 @@ export declare class DrawComponent implements OnInit, OnDestroy {
25
26
  */
26
27
  tableTemplate: EntityTableTemplate;
27
28
  geometryType: typeof GeometryType;
29
+ map: IgoMap;
30
+ get stores(): FeatureStore<FeatureWithDraw>[];
31
+ set stores(value: FeatureStore<FeatureWithDraw>[]);
32
+ private _stores;
33
+ get drawControls(): [string, DrawControl][];
34
+ set drawControls(value: [string, DrawControl][]);
35
+ private _drawControls;
36
+ get activeDrawingLayer(): VectorLayer;
37
+ set activeDrawingLayer(value: VectorLayer);
38
+ private _activeDrawingLayer;
39
+ activeLayerChange: EventEmitter<VectorLayer>;
40
+ drawControlsEvent: EventEmitter<[string, DrawControl][]>;
41
+ layersIDEvent: EventEmitter<string>;
28
42
  fillColor: string;
29
43
  strokeColor: string;
30
44
  strokeWidth: number;
31
45
  fontSize: string;
32
46
  fontStyle: string;
33
- map: IgoMap;
34
- store: FeatureStore<FeatureWithDraw>;
47
+ activeStore: FeatureStore<FeatureWithDraw>;
48
+ private layerCounterID;
35
49
  draw$: BehaviorSubject<Draw>;
36
- private olDrawingLayerSource;
37
- private drawControl;
50
+ private activeDrawingLayerSource;
51
+ private activeDrawControl;
38
52
  private drawEnd$$;
39
53
  private drawSelect$$;
40
- private olDrawingLayer;
41
54
  selectedFeatures$: BehaviorSubject<FeatureWithDraw[]>;
42
55
  fillForm: string;
43
56
  strokeForm: string;
@@ -50,6 +63,9 @@ export declare class DrawComponent implements OnInit, OnDestroy {
50
63
  icons: Array<string>;
51
64
  icon: string;
52
65
  private numberOfDrawings;
66
+ isCreatingNewLayer: boolean;
67
+ private currGeometryType;
68
+ select: any;
53
69
  constructor(languageService: LanguageService, formBuilder: UntypedFormBuilder, drawStyleService: DrawStyleService, dialog: MatDialog, drawIconService: DrawIconService);
54
70
  ngOnInit(): void;
55
71
  /**
@@ -93,6 +109,7 @@ export declare class DrawComponent implements OnInit, OnDestroy {
93
109
  */
94
110
  private addFeatureToStore;
95
111
  private buildForm;
112
+ setupLayer(isNewLayer?: boolean): void;
96
113
  /**
97
114
  * Called when the user double-clicks the selected drawing
98
115
  */
@@ -108,6 +125,11 @@ export declare class DrawComponent implements OnInit, OnDestroy {
108
125
  * @internal
109
126
  */
110
127
  onToggleDrawControl(toggleIsChecked: boolean): void;
128
+ /**
129
+ * Display the current layer with the current store and the current layerSource
130
+ */
131
+ onLayerChange(currLayer?: VectorLayer): void;
132
+ createLayer(newTitle?: any, isNewLayer?: any): void;
111
133
  /**
112
134
  * Called when the user changes the color in a color picker
113
135
  * @param labelsAreShown wheter the labels are shown or not
@@ -145,10 +167,16 @@ export declare class DrawComponent implements OnInit, OnDestroy {
145
167
  private updateFontSizeAndStyle;
146
168
  private updateFillAndStrokeColor;
147
169
  private updateOffset;
148
- /**
149
- * Check the amount of rows as a possible alternative
150
- */
170
+ getFeatureFontSize(): string;
171
+ getFeatureFontStyle(): string;
172
+ getFeatureFillColor(): string;
173
+ getFeatureStrokeColor(): string;
174
+ getFeatureOffsetX(): number;
175
+ getFeatureOffsetY(): number | "0";
176
+ get allFontStyles(): string[];
177
+ get allLayers(): import("@igo2/geo").Layer[];
151
178
  updateHeightTable(): void;
179
+ updateActiveLayer(): import("@igo2/geo").Layer;
152
180
  /**
153
181
  * Activate the correct control
154
182
  */
@@ -177,5 +205,5 @@ export declare class DrawComponent implements OnInit, OnDestroy {
177
205
  */
178
206
  private elementStyle;
179
207
  static ɵfac: i0.ɵɵFactoryDeclaration<DrawComponent, never>;
180
- 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>;
208
+ 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>;
181
209
  }
@@ -1,31 +1,32 @@
1
1
  import * as i0 from "@angular/core";
2
2
  import * as i1 from "./draw.component";
3
3
  import * as i2 from "./draw-popup.component";
4
- import * as i3 from "./draw-shorcuts.component";
5
- import * as i4 from "@angular/forms";
6
- import * as i5 from "@angular/common";
7
- import * as i6 from "@angular/material/button";
8
- import * as i7 from "@angular/material/button-toggle";
9
- import * as i8 from "@angular/material/divider";
10
- import * as i9 from "@angular/material/form-field";
11
- import * as i10 from "@angular/material/icon";
12
- import * as i11 from "@angular/material/badge";
13
- import * as i12 from "@angular/material/tooltip";
14
- import * as i13 from "@angular/material/input";
15
- import * as i14 from "@angular/material/list";
16
- import * as i15 from "@angular/material/select";
17
- import * as i16 from "@angular/material/slide-toggle";
18
- import * as i17 from "@angular/material/dialog";
19
- import * as i18 from "@igo2/core";
20
- import * as i19 from "@igo2/common";
21
- import * as i20 from "ngx-color-picker";
22
- import * as i21 from "@angular/platform-browser";
23
- import * as i22 from "@angular/platform-browser/animations";
4
+ import * as i3 from "./draw-layer-popup.component";
5
+ import * as i4 from "./draw-shorcuts.component";
6
+ import * as i5 from "@angular/forms";
7
+ import * as i6 from "@angular/common";
8
+ import * as i7 from "@angular/material/button";
9
+ import * as i8 from "@angular/material/button-toggle";
10
+ import * as i9 from "@angular/material/divider";
11
+ import * as i10 from "@angular/material/form-field";
12
+ import * as i11 from "@angular/material/icon";
13
+ import * as i12 from "@angular/material/badge";
14
+ import * as i13 from "@angular/material/tooltip";
15
+ import * as i14 from "@angular/material/input";
16
+ import * as i15 from "@angular/material/list";
17
+ import * as i16 from "@angular/material/select";
18
+ import * as i17 from "@angular/material/slide-toggle";
19
+ import * as i18 from "@angular/material/dialog";
20
+ import * as i19 from "@igo2/core";
21
+ import * as i20 from "@igo2/common";
22
+ import * as i21 from "ngx-color-picker";
23
+ import * as i22 from "@angular/platform-browser";
24
+ import * as i23 from "@angular/platform-browser/animations";
24
25
  /**
25
26
  * @ignore
26
27
  */
27
28
  export declare class IgoDrawModule {
28
29
  static ɵfac: i0.ɵɵFactoryDeclaration<IgoDrawModule, never>;
29
- 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]>;
30
+ 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]>;
30
31
  static ɵinj: i0.ɵɵInjectorDeclaration<IgoDrawModule>;
31
32
  }
@@ -1,5 +1,7 @@
1
1
  import { Feature } from '../../feature/shared/feature.interfaces';
2
2
  import { IgoMap } from '../../map/shared/map';
3
+ import { DrawControl } from '../../geometry/shared/controls/draw';
4
+ import { FeatureStore } from '../../feature';
3
5
  export interface DrawOptions {
4
6
  icons?: string[];
5
7
  }
@@ -28,3 +30,7 @@ export interface FeatureWithDrawProperties {
28
30
  export interface FeatureStoreDrawStrategyOptions {
29
31
  map: IgoMap;
30
32
  }
33
+ export interface StoreAndDrawControl {
34
+ store: FeatureStore<FeatureWithDraw>;
35
+ drawControl: DrawControl;
36
+ }
@@ -1,6 +1,6 @@
1
1
  import { ChangeDetectorRef, EventEmitter, OnInit, OnDestroy } from '@angular/core';
2
2
  import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
3
- import { NetworkService, MessageService, LanguageService } from '@igo2/core';
3
+ import { NetworkService, MessageService } from '@igo2/core';
4
4
  import { ConfigService } from '@igo2/core';
5
5
  import type { Toolbox } from '@igo2/common';
6
6
  import { Feature } from '../shared';
@@ -14,7 +14,6 @@ export declare class FeatureDetailsComponent implements OnInit, OnDestroy {
14
14
  private sanitizer;
15
15
  private networkService;
16
16
  private messageService;
17
- private languageService;
18
17
  private configService;
19
18
  private state;
20
19
  private unsubscribe$;
@@ -38,7 +37,7 @@ export declare class FeatureDetailsComponent implements OnInit, OnDestroy {
38
37
  * @internal
39
38
  */
40
39
  get icon(): string;
41
- constructor(http: HttpClient, cdRef: ChangeDetectorRef, sanitizer: DomSanitizer, networkService: NetworkService, messageService: MessageService, languageService: LanguageService, configService: ConfigService);
40
+ constructor(http: HttpClient, cdRef: ChangeDetectorRef, sanitizer: DomSanitizer, networkService: NetworkService, messageService: MessageService, configService: ConfigService);
42
41
  ngOnInit(): void;
43
42
  ngOnDestroy(): void;
44
43
  urlSanitizer(value: any): SafeResourceUrl;
@@ -3,4 +3,5 @@ export interface ImportExportServiceOptions {
3
3
  clientSideFileSizeMaxMb?: number;
4
4
  forceNaming?: boolean;
5
5
  formats?: string[];
6
+ configFileToGeoDBService?: string;
6
7
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@igo2/geo",
3
- "version": "1.13.2",
3
+ "version": "1.13.3",
4
4
  "description": "IGO Library",
5
5
  "author": "IGO Community",
6
6
  "keywords": [
@@ -31,9 +31,9 @@
31
31
  "@angular/core": "^14.1.2",
32
32
  "@angular/forms": "^14.1.2",
33
33
  "@angular/material": "^14.1.2",
34
- "@igo2/common": "^1.13.2",
35
- "@igo2/core": "^1.13.2",
36
- "@igo2/utils": "^1.13.2",
34
+ "@igo2/common": "^1.13.3",
35
+ "@igo2/core": "^1.13.3",
36
+ "@igo2/utils": "^1.13.3",
37
37
  "ol": "^7.1.0",
38
38
  "proj4": "^2.8.0",
39
39
  "rxjs": "^7.5.6",