Commit 7685270f authored by ndurand's avatar ndurand
Browse files

Fusion avec conflit de develop_rc dans develop

parent 5f11af81
......@@ -317,11 +317,18 @@
}
}
},
"rxjs": {
"version": "6.6.7",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
"integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
"requires": {
"tslib": "^1.9.0"
}
},
"tslib": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
"dev": true
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
}
}
},
......@@ -1792,6 +1799,14 @@
"@jridgewell/sourcemap-codec": "^1.4.10"
}
},
"@kolkov/angular-editor": {
"version": "3.0.0-beta.0",
"resolved": "https://registry.npmjs.org/@kolkov/angular-editor/-/angular-editor-3.0.0-beta.0.tgz",
"integrity": "sha512-uUa8FW9lFskfL8rans7YRtUQIVK1Qj8bBT9q1MwPXFZ1t+/KfPk62FL5IuMfcnu28UfKl0J2AnGYwbQe4h+Etw==",
"requires": {
"tslib": "^2.3.0"
}
},
"@mapbox/jsonlint-lines-primitives": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
......@@ -8522,9 +8537,12 @@
}
},
"ngx-bootstrap": {
"version": "5.6.2",
"resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-5.6.2.tgz",
"integrity": "sha512-6YHXtdXkGH3w0NQoaUgNYAcrj064Lv5RTO284ha/hvpNTrh55yQz2cVh0VvwBk3MjyY2tdmLH4SuCJDszYdYiw=="
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-8.0.0.tgz",
"integrity": "sha512-UjJ/57Pr7ctdI2L113QX1IqJPYtOMrp5Qq/RLvUT1TOwPQWPi9LXTQ/7BtipkptQjer7Fk9yueITH3Y8vD+Dmg==",
"requires": {
"tslib": "^2.0.0"
}
},
"ngx-color-picker": {
"version": "11.0.0",
......@@ -8604,13 +8622,6 @@
"integrity": "sha512-S7W//EcZQjsrP3eVxtgmh3bpVCSkTJjgHliV4UJI9Wd3mxG/VM9dE1JtnsCKAlXtq4IjMq4Vov8teOJDRbJIeA==",
"requires": {
"tslib": "^1.9.0"
},
"dependencies": {
"tslib": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
}
}
},
"ngx-treeview": {
......
......@@ -2,16 +2,17 @@
"name": "@alkante/visualiseur-core",
"version": "0.1.37",
"peerDependencies": {
"@angular/animations": "^7.2.15",
"@angular/common": "^7.2.15",
"@angular/compiler": "^7.2.15",
"@angular/core": "^7.2.15",
"@angular/forms": "^7.2.15",
"@angular/platform-browser": "^7.2.15",
"@angular/platform-browser-dynamic": "^7.2.15",
"@angular/router": "^7.2.15",
"@ng-bootstrap/ng-bootstrap": "^4.2.2",
"@ngx-pwa/local-storage": "^6.2.5",
"@angular/animations": "13.3.4",
"@angular/common": "13.3.4",
"@angular/compiler": "13.3.4",
"@angular/core": "13.3.4",
"@angular/forms": "13.3.4",
"@angular/localize": "13.3.4",
"@angular/platform-browser": "13.3.4",
"@angular/platform-browser-dynamic": "13.3.4",
"@angular/router": "13.3.4",
"@ng-bootstrap/ng-bootstrap": "^11.0.1",
"@ngx-pwa/local-storage": "^13.0.2",
"@turf/boolean-contains": "^6.0.1",
"@turf/boolean-crosses": "^6.0.1",
"@turf/boolean-within": "^6.0.1",
......@@ -19,7 +20,9 @@
"@types/pegjs": "^0.10.1",
"angular-popper": "^2.0.1",
"bootstrap": "^4.3.1",
"bootstrap-slider": "^10.6.2",
"bootstrap-slider": "^11.0.2",
"@kolkov/angular-editor": "^3.0.0-beta.0",
"@marmotteintrepide/ngx-bootstrap-slider": "13.0.2",
"core-js": "^2.6.9",
"core-util-is": "^1.0.2",
"file-saver": "^2.0.2",
......@@ -29,23 +32,22 @@
"moment": "^2.24.0",
"ng-multiselect-dropdown": "0.2.5",
"ng2-dragula": "^2.1.1",
"ngx-bootstrap": "^3.3.0",
"ngx-color-picker": "^8.2.0",
"ngx-editor": "^4.1.0",
"ngx-icon-picker": "0.0.10",
"ngx-bootstrap": "~8.0.0",
"ngx-color-picker": "^11.0.0",
"ngx-i18nsupport": "^0.17.1",
"ngx-treeview": "^6.0.2",
"ngx-webstorage": "^3.0.2",
"ngx-webstorage": "^9.0.0",
"ogc-schemas": "^2.6.1",
"ol": "^6.0.1",
"ol-ext": "^3.1.6",
"ol": "^6.9.0",
"ol-ext": "~3.2.14",
"pegjs": "^0.10.0",
"popper.js": "^1.15.0",
"proj4": "^2.5.0",
"rxjs": "~6.3.3",
"popper.js": "~1.16.0",
"proj4": "~2.7.5",
"rxjs": "^7.4.0",
"tslib": "^2.0.0",
"typescript": "^3.2.4",
"typescript": "4.4.3",
"w3c-schemas": "^1.4.0",
"zone.js": "~0.8.26"
"zone.js": "~0.11.4"
},
"devDependencies": {
"@types/jsts": "^0.17.0"
......
......@@ -4,6 +4,7 @@ import {
OnDestroy,
ViewChild,
ElementRef,
Type,
} from "@angular/core";
import { NgbActiveModal, NgbModal } from "@ng-bootstrap/ng-bootstrap";
import VectorLayer from "ol/layer/Vector";
......@@ -122,16 +123,17 @@ export class EditingModalComponent implements OnInit, OnDestroy {
layerType: string;
nbSelectedFeatures = 0;
@ViewChild("cancelConfirm", {read: null, static: true})
@ViewChild("cancelConfirm", { read: null, static: true })
cancelConfirm: AlertConfirmPromptModalComponent;
@ViewChild("saveConfirm", {read: null, static: true})
@ViewChild("saveConfirm", { read: null, static: true })
saveConfirm: AlertConfirmPromptModalComponent;
@ViewChild("featureError", {read: null, static: true})
@ViewChild("featureError", { read: null, static: true })
featureError: AlertConfirmPromptModalComponent;
@ViewChild("featureDeleted", {read: null, static: true})
@ViewChild("featureDeleted", { read: null, static: true })
featureDeleted: AlertConfirmPromptModalComponent;
@ViewChild("copyToast", {read: null, static: true}) copyToast: ElementRef;
@ViewChild("saveError", {read: null, static: true}) saveError: AlertConfirmPromptModalComponent;
@ViewChild("copyToast", { read: null, static: true }) copyToast: ElementRef;
@ViewChild("saveError", { read: null, static: true })
saveError: AlertConfirmPromptModalComponent;
isToastVisible = false;
......@@ -210,7 +212,7 @@ export class EditingModalComponent implements OnInit, OnDestroy {
source: this.editableVectorLayer.getSource(),
type:
this.layerType === "Linestring"
? "LineString"
? ("LineString" as any)
: this.layerType,
style: this.drawLayerService.getDefaultDrawStyle(),
});
......@@ -525,7 +527,7 @@ export class EditingModalComponent implements OnInit, OnDestroy {
if (newFeature) {
Object.keys(feature.getProperties()).forEach((key) => {
if (key !== "geometry" && key !== "gid") {
newFeature.set(key, {read: null, static: true});
newFeature.set(key, { read: null, static: true });
}
});
......@@ -1163,7 +1165,9 @@ export class EditingModalComponent implements OnInit, OnDestroy {
10
);
const lineStrings = (feature.getGeometry() as MultiLineString).getLineStrings();
const lineStrings = (
feature.getGeometry() as MultiLineString
).getLineStrings();
const multiLineString = new MultiLineString([]);
lineStrings.forEach((lineString) => {
......@@ -1243,7 +1247,7 @@ export class EditingModalComponent implements OnInit, OnDestroy {
}
const geojsonA = this.geojson.writeFeatureObject(featToCut);
const geojsonB = (this.geojson.writeFeatureObject(featLineCut) as Splitter);
const geojsonB = this.geojson.writeFeatureObject(featLineCut) as Splitter;
const split = lineSplit<any>(geojsonA, geojsonB);
......@@ -1412,7 +1416,10 @@ export class EditingModalComponent implements OnInit, OnDestroy {
// Ajout de l'interaction permettant de dessiner
this.drawGeomToFeature = new Draw({
source: this.editableVectorLayer.getSource(),
type: this.layerType === "Linestring" ? "LineString" : this.layerType,
type:
this.layerType === "Linestring"
? ("LineString" as any)
: this.layerType,
style: this.drawLayerService.getDefaultDrawStyle(),
});
......
......@@ -100,8 +100,9 @@
<ng-container i18n="interrogatingMailingModalMailMessageLabel">Message</ng-container>*
</label>
<div class="col-9 px-0">
<ngx-text-editor [placeholder]="editorPlaceholder" [spellcheck]="true" formControlName="mailingMessage">
</ngx-text-editor>
<angular-editor [placeholder]="editorPlaceholder" [config]="editorConfig"
formControlName="mailingMessage">
</angular-editor>
</div>
</div>
<div class="col-12 form-group row">
......
......@@ -9,11 +9,18 @@ import {
} from "@angular/core";
import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
import { LayerDataResponseType } from "../../map/services/interrogating.service";
import { AbstractControl, FormGroup, FormBuilder, FormControl, Validators } from "@angular/forms";
import {
AbstractControl,
FormGroup,
FormBuilder,
FormControl,
Validators,
} from "@angular/forms";
import { Subscription } from "rxjs";
import { UserConnectionService } from "../../services/user-connection.service";
import { InterrogatingMailingService } from "../../services/interrogating-mailing.service";
import { AlertConfirmPromptModalComponent } from "../alert-confirm-prompt-modal/alert-confirm-prompt-modal.component";
import { AngularEditorConfig } from "@kolkov/angular-editor";
@Component({
selector: "alk-interrogating-mailing-modal",
......@@ -23,6 +30,48 @@ import { AlertConfirmPromptModalComponent } from "../alert-confirm-prompt-modal/
export class InterrogatingMailingModalComponent
implements OnInit, AfterViewInit, OnDestroy
{
editorConfig: AngularEditorConfig = {
editable: true,
spellcheck: true,
height: "auto",
minHeight: "0",
maxHeight: "auto",
width: "auto",
minWidth: "0",
translate: "yes",
enableToolbar: true,
showToolbar: true,
placeholder: "Enter text here...",
defaultParagraphSeparator: "",
defaultFontName: "",
defaultFontSize: "",
fonts: [
{ class: "arial", name: "Arial" },
{ class: "times-new-roman", name: "Times New Roman" },
{ class: "calibri", name: "Calibri" },
{ class: "comic-sans-ms", name: "Comic Sans MS" },
],
customClasses: [
{
name: "quote",
class: "quote",
},
{
name: "redText",
class: "redText",
},
{
name: "titleText",
class: "titleText",
tag: "h1",
},
],
uploadUrl: "v1/image",
uploadWithCredentials: false,
sanitize: true,
toolbarPosition: "top",
toolbarHiddenButtons: [["bold", "italic"], ["fontSize"]],
};
mapName: string | number;
mailingSubscription: Subscription;
coreServiceSubscription: Subscription;
......@@ -50,7 +99,8 @@ export class InterrogatingMailingModalComponent
savedModels = [];
selectedModelId: any;
selectedModel: any;
@ViewChild("checkboxInput", {read: null, static: true}) checkboxInput: ElementRef;
@ViewChild("checkboxInput", { read: null, static: true })
checkboxInput: ElementRef;
editorPlaceholder = "";
/* editorConfig = {
editable: true,
......@@ -74,10 +124,10 @@ export class InterrogatingMailingModalComponent
showToastTestError = false;
// Récupération des élements nécessaires à la traduction
@ViewChild("editorConfigPlaceholder", {read: null, static: true})
@ViewChild("editorConfigPlaceholder", { read: null, static: true })
editorConfigPlaceholder: ElementRef;
// Récupération du composant de confirmation
@ViewChild(AlertConfirmPromptModalComponent, {read: null, static: true})
@ViewChild(AlertConfirmPromptModalComponent, { read: null, static: true })
confirmModal: AlertConfirmPromptModalComponent;
constructor(
......
......@@ -108,7 +108,14 @@ export class EditingToolService {
);
}
getDrafts(uuid: string): Observable<any> {
getDraft(uuid: string, gid: any, nature: string = "edit"): Observable<any> {
return this.http.get(
`${this.catalogueUrl}/api/data/draft/${uuid}?gid=${gid}&nature=${nature}`,
this.httpOptions
);
}
getAllDrafts(uuid: string): Observable<any> {
return this.http.get(
`${this.catalogueUrl}/api/data/draft/${uuid}`,
this.httpOptions
......@@ -146,6 +153,13 @@ export class EditingToolService {
);
}
deleteDraft(uuid: string, gids: string): Observable<any> {
return this.http.delete(
`${this.catalogueUrl}/api/data/draft/${uuid}/${gids}`,
this.httpOptions
);
}
getUserDefinedEnum(uuid: string): Observable<any> {
return this.http.get(
`${this.catalogueUrl}/api/enum/${uuid}`,
......
import { NgModule, ModuleWithProviders, CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { VisualiseurCoreComponent } from './visualiseur-core.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common';
import { HttpClientModule, HttpClientJsonpModule } from '@angular/common/http';
import {
NgModule,
ModuleWithProviders,
CUSTOM_ELEMENTS_SCHEMA,
NO_ERRORS_SCHEMA,
} from "@angular/core";
import { BrowserModule } from "@angular/platform-browser";
import { VisualiseurCoreComponent } from "./visualiseur-core.component";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { CommonModule } from "@angular/common";
import { HttpClientModule, HttpClientJsonpModule } from "@angular/common/http";
/* ========================= Action Buttons Import =========================*/
import { ItemComponent } from './action-button-dropdown/item/item.component';
import { HeaderComponent } from './action-button-dropdown/header/header.component';
import { ConnexionButtonComponent } from './connexion-button/connexion-button.component';
import { ItemComponent } from "./action-button-dropdown/item/item.component";
import { HeaderComponent } from "./action-button-dropdown/header/header.component";
import { ConnexionButtonComponent } from "./connexion-button/connexion-button.component";
/* ========================= Map Tools =========================*/
import { SidebarComponent } from './layers-legend/sidebars/sidebar/sidebar.component';
import { MobileSidebarComponent } from './layers-legend/sidebars/mobile-sidebar/mobile-sidebar.component';
import { ResultBottomBoxComponent } from './interrogating-results/result-bottom-box/result-bottom-box.component';
import { ResultMobileComponent } from './interrogating-results/result-mobile/result-mobile.component';
import { LayersLegendComponent } from './layers-legend/layers-legend/layers-legend.component';
import { BaseMapDropdownComponent } from './map-tools/base-map-dropdown/base-map-dropdown.component';
import { MapScaleDropdownComponent } from './map-tools/map-scale-dropdown/map-scale-dropdown.component';
import { CopyrightComponent } from './map-tools/copyright/copyright.component';
import { LogoComponent } from './map-tools/logo/logo.component';
import { ResultButtonComponent } from './map-tools/result-button/result-button.component';
import { WmsTimeComponent } from './map-tools/wms-time/wms-time.component';
import { MapVisualisationComponent } from './map-tools/map-visualisation/map-visualisation.component';
import { SharingButtonComponent } from './action-buttons/sharing-button/sharing-button.component';
import { PrintingButtonComponent } from './action-buttons/printing-button/printing-button.component';
import { DownloadingButtonComponent } from './action-buttons/downloading-button/downloading-button.component';
import { OpeningButtonComponent } from './action-buttons/opening-button/opening-button.component';
import { SavingButtonComponent } from './action-buttons/saving-button/saving-button.component';
import { LocatingButtonComponent } from './action-buttons/locating-button/locating-button.component';
import { MeasuringButtonComponent } from './action-buttons/measuring-button/measuring-button.component';
import { InterrogatingButtonComponent } from './action-buttons/interrogating-button/interrogating-button.component';
import { AnnotatingButtonComponent } from './action-buttons/annotating-button/annotating-button.component';
import { DrawingButtonComponent } from './action-buttons/drawing-button/drawing-button.component';
import { NavProjectComponent } from './nav-project/nav-project.component';
import { PresetZonesContainerComponent } from './modals/locating-preset-zones-modal/preset-zones-container/preset-zones-container.component';
import { PresetZoneSelectorComponent } from './modals/locating-preset-zones-modal/preset-zones-container/preset-zone-selector/preset-zone-selector.component';
import { PresetZoneFirstSelectorComponent } from './modals/locating-preset-zones-modal/preset-zones-container/preset-zone-first-selector/preset-zone-first-selector.component';
import { ChoseServerComponent } from './modals/add-layer-modal/chose-server/chose-server.component';
import { CguDisplayComponent } from './cgu-display/cgu-display.component';
import { ActionButtonsComponent } from './action-buttons/action-buttons.component';
import { AddLayerComponent } from './layers-legend/sidebars/add-layer/add-layer.component';
import { ResultContentComponent } from './interrogating-results/result-modal/result-content/result-content.component';
import { ResearchComponent } from './map-tools/research/research.component';
import { ZoomInComponent } from './map/buttons/zoom-in/zoom-in.component';
import { OlMapComponent } from './map/ol-map/ol-map.component';
import { DrawingPolygonComponent } from './map/tools/annotating-tools/drawing-polygon/drawing-polygon.component';
import { MeasuringToolsComponent } from './map/tools/measuring-tools/measuring-tools.component';
import { DrawingLinestringComponent } from './map/tools/annotating-tools/drawing-linestring/drawing-linestring.component';
import { DrawingSymbolComponent } from './map/tools/annotating-tools/drawing-symbol/drawing-symbol.component';
import { DrawingCircleComponent } from './map/tools/annotating-tools/drawing-circle/drawing-circle.component';
import { GeolocationButtonComponent } from './map-tools/geolocation-button/geolocation-button.component';
import { SidebarComponent } from "./layers-legend/sidebars/sidebar/sidebar.component";
import { MobileSidebarComponent } from "./layers-legend/sidebars/mobile-sidebar/mobile-sidebar.component";
import { ResultBottomBoxComponent } from "./interrogating-results/result-bottom-box/result-bottom-box.component";
import { ResultMobileComponent } from "./interrogating-results/result-mobile/result-mobile.component";
import { LayersLegendComponent } from "./layers-legend/layers-legend/layers-legend.component";
import { BaseMapDropdownComponent } from "./map-tools/base-map-dropdown/base-map-dropdown.component";
import { MapScaleDropdownComponent } from "./map-tools/map-scale-dropdown/map-scale-dropdown.component";
import { CopyrightComponent } from "./map-tools/copyright/copyright.component";
import { LogoComponent } from "./map-tools/logo/logo.component";
import { ResultButtonComponent } from "./map-tools/result-button/result-button.component";
import { WmsTimeComponent } from "./map-tools/wms-time/wms-time.component";
import { MapVisualisationComponent } from "./map-tools/map-visualisation/map-visualisation.component";
import { SharingButtonComponent } from "./action-buttons/sharing-button/sharing-button.component";
import { PrintingButtonComponent } from "./action-buttons/printing-button/printing-button.component";
import { DownloadingButtonComponent } from "./action-buttons/downloading-button/downloading-button.component";
import { OpeningButtonComponent } from "./action-buttons/opening-button/opening-button.component";
import { SavingButtonComponent } from "./action-buttons/saving-button/saving-button.component";
import { LocatingButtonComponent } from "./action-buttons/locating-button/locating-button.component";
import { MeasuringButtonComponent } from "./action-buttons/measuring-button/measuring-button.component";
import { InterrogatingButtonComponent } from "./action-buttons/interrogating-button/interrogating-button.component";
import { AnnotatingButtonComponent } from "./action-buttons/annotating-button/annotating-button.component";
import { DrawingButtonComponent } from "./action-buttons/drawing-button/drawing-button.component";
import { NavProjectComponent } from "./nav-project/nav-project.component";
import { PresetZonesContainerComponent } from "./modals/locating-preset-zones-modal/preset-zones-container/preset-zones-container.component";
import { PresetZoneSelectorComponent } from "./modals/locating-preset-zones-modal/preset-zones-container/preset-zone-selector/preset-zone-selector.component";
import { PresetZoneFirstSelectorComponent } from "./modals/locating-preset-zones-modal/preset-zones-container/preset-zone-first-selector/preset-zone-first-selector.component";
import { ChoseServerComponent } from "./modals/add-layer-modal/chose-server/chose-server.component";
import { CguDisplayComponent } from "./cgu-display/cgu-display.component";
import { ActionButtonsComponent } from "./action-buttons/action-buttons.component";
import { AddLayerComponent } from "./layers-legend/sidebars/add-layer/add-layer.component";
import { ResultContentComponent } from "./interrogating-results/result-modal/result-content/result-content.component";
import { ResearchComponent } from "./map-tools/research/research.component";
import { ZoomInComponent } from "./map/buttons/zoom-in/zoom-in.component";
import { OlMapComponent } from "./map/ol-map/ol-map.component";
import { DrawingPolygonComponent } from "./map/tools/annotating-tools/drawing-polygon/drawing-polygon.component";
import { MeasuringToolsComponent } from "./map/tools/measuring-tools/measuring-tools.component";
import { DrawingLinestringComponent } from "./map/tools/annotating-tools/drawing-linestring/drawing-linestring.component";
import { DrawingSymbolComponent } from "./map/tools/annotating-tools/drawing-symbol/drawing-symbol.component";
import { DrawingCircleComponent } from "./map/tools/annotating-tools/drawing-circle/drawing-circle.component";
import { GeolocationButtonComponent } from "./map-tools/geolocation-button/geolocation-button.component";
/* ========================= Modals =========================*/
import { ResultModalComponent } from './interrogating-results/result-modal/result-modal.component';
import { SharingModalComponent } from './modals/sharing-modal/sharing-modal.component';
import { PrintingExportModalComponent } from './modals/printing-export-modal/printing-export-modal.component';
import { PrintingPdfModalComponent } from './modals/printing-pdf-modal/printing-pdf-modal.component';
import { PrintingImageModalComponent } from './modals/printing-image-modal/printing-image-modal.component';
import { DownloadingModalComponent } from './modals/downloading-modal/downloading-modal.component';
import { OpeningModalComponent } from './modals/opening-modal/opening-modal.component';
import { SavingModalComponent } from './modals/saving-modal/saving-modal.component';
import { LocatingManageModalComponent } from './modals/locating-manage-modal/locating-manage-modal.component';
import { LocatingAddModalComponent } from './modals/locating-add-modal/locating-add-modal.component';
import { LocatingPresetZonesModalComponent } from './modals/locating-preset-zones-modal/locating-preset-zones-modal.component';
import { MeasuringModalComponent } from './map/tools/measuring-tools/measuring-modal/measuring-modal.component';
import { InterrogatingModalComponent } from './map/tools/interrogating-tools/interrogating-modal/interrogating-modal.component';
import { AnnotatingModalComponent } from './map/tools/annotating-tools/annotating-modal/annotating-modal.component';
import { PreEditingModalComponent } from './map/tools/editing-tools/pre-editing-modal/pre-editing-modal.component';
import { EditingModalComponent } from './map/tools/editing-tools/pre-editing-modal/editing-modal/editing-modal.component';
import { SharingContentModalComponent } from './modals/sharing-modal/sharing-content-modal/sharing-content-modal.component';
import { OpeningContentModalComponent } from './modals/opening-modal/opening-content-modal/opening-content-modal.component';
import { GenerateStyleDrawsModalComponent } from './map/tools/annotating-tools/style-draws/style-draws-modal/generate-style-draws-modal/generate-style-draws-modal.component';
import { MergeFicheModalComponent } from './modals/merge-fiche-modal/merge-fiche-modal.component';
import { InterrogatingGrantedRequestModalComponent } from './modals/interrogating-granted-request-modal/interrogating-granted-request-modal.component';
import { InterrogatingBufferModalComponent } from './modals/interrogating-buffer-modal/interrogating-buffer-modal.component';
import { ExportLegendModalComponent } from './modals/printing-export-modal/export-legend-modal/export-legend-modal.component';
import { ImportFileModalComponent } from './modals/import-file-modal/import-file-modal.component';
import { HelpingModalComponent } from './modals/helping-modal/helping-modal.component';
import { AddLayerModalComponent } from './modals/add-layer-modal/add-layer-modal.component';
import { StyleDrawsModalComponent } from './map/tools/annotating-tools/style-draws/style-draws-modal/style-draws-modal.component';
import { InsertTextModalComponent } from './map/tools/annotating-tools/insert-text/insert-text-modal/insert-text-modal.component';
import { BuffersModalComponent } from './map/tools/annotating-tools/buffers/buffers-modal/buffers-modal.component';
import { ResultModalFicheComponent } from './interrogating-results/result-modal-fiche/result-modal-fiche.component';
import { ModalConfirmComponent } from './modals/alert-confirm-prompt-modal/alert-confirm-prompt-modal.component';
import { SearchMpaModalComponent } from './modals/search-mpa-modal/search-mpa-modal.component';
import { InterrogatingMailingModalComponent } from './modals/interrogating-mailing-modal/interrogating-mailing-modal.component';
import { ResultModalComponent } from "./interrogating-results/result-modal/result-modal.component";
import { SharingModalComponent } from "./modals/sharing-modal/sharing-modal.component";
import { PrintingExportModalComponent } from "./modals/printing-export-modal/printing-export-modal.component";
import { PrintingPdfModalComponent } from "./modals/printing-pdf-modal/printing-pdf-modal.component";
import { PrintingImageModalComponent } from "./modals/printing-image-modal/printing-image-modal.component";
import { DownloadingModalComponent } from "./modals/downloading-modal/downloading-modal.component";
import { OpeningModalComponent } from "./modals/opening-modal/opening-modal.component";
import { SavingModalComponent } from "./modals/saving-modal/saving-modal.component";
import { LocatingManageModalComponent } from "./modals/locating-manage-modal/locating-manage-modal.component";
import { LocatingAddModalComponent } from "./modals/locating-add-modal/locating-add-modal.component";
import { LocatingPresetZonesModalComponent } from "./modals/locating-preset-zones-modal/locating-preset-zones-modal.component";
import { MeasuringModalComponent } from "./map/tools/measuring-tools/measuring-modal/measuring-modal.component";
import { InterrogatingModalComponent } from "./map/tools/interrogating-tools/interrogating-modal/interrogating-modal.component";
import { AnnotatingModalComponent } from "./map/tools/annotating-tools/annotating-modal/annotating-modal.component";
import { PreEditingModalComponent } from "./map/tools/editing-tools/pre-editing-modal/pre-editing-modal.component";
import { EditingModalComponent } from "./map/tools/editing-tools/pre-editing-modal/editing-modal/editing-modal.component";
import { SharingContentModalComponent } from "./modals/sharing-modal/sharing-content-modal/sharing-content-modal.component";
import { OpeningContentModalComponent } from "./modals/opening-modal/opening-content-modal/opening-content-modal.component";
import { GenerateStyleDrawsModalComponent } from "./map/tools/annotating-tools/style-draws/style-draws-modal/generate-style-draws-modal/generate-style-draws-modal.component";
import { MergeFicheModalComponent } from "./modals/merge-fiche-modal/merge-fiche-modal.component";
import { InterrogatingGrantedRequestModalComponent } from "./modals/interrogating-granted-request-modal/interrogating-granted-request-modal.component";