Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
prodige
bdl-alkante-visualiseur-core
Commits
2930f452
Commit
2930f452
authored
Oct 24, 2022
by
Justine
Browse files
correctionscorrections divers + adieu ngx-text-editor
parent
29825b98
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
npm-shrinkwrap.json
View file @
2930f452
...
...
@@ -17,6 +17,7 @@
"@angular/platform-browser": "13.3.4",
"@angular/platform-browser-dynamic": "13.3.4",
"@angular/router": "13.3.4",
"@kolkov/angular-editor": "^3.0.0-beta.0",
"@marmotteintrepide/ngx-bootstrap-slider": "13.0.2",
"@ng-bootstrap/ng-bootstrap": "^11.0.1",
"@ngx-pwa/local-storage": "^13.0.2",
...
...
@@ -46,7 +47,6 @@
"ngx-editor": "^13.0.0",
"ngx-i18nsupport": "^0.17.1",
"ngx-mask": "^13.1.15",
"ngx-text-editor": "git+https://github.com/MarmotteIntrepide/ngx-text-editor.git",
"ngx-treeview": "^6.0.2",
"ngx-webstorage": "^9.0.0",
"node-sass": "^4.14.1",
...
...
@@ -2647,6 +2647,18 @@
"@jridgewell/sourcemap-codec": "^1.4.10"
}
},
"node_modules/@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==",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/common": ">=13",
"@angular/core": ">=13"
}
},
"node_modules/@mapbox/jsonlint-lines-primitives": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
...
...
@@ -6391,11 +6403,6 @@
"url": "https://github.com/fb55/domhandler?sponsor=1"
}
},
"node_modules/domino": {
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz",
"integrity": "sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="
},
"node_modules/domutils": {
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
...
...
@@ -11617,176 +11624,6 @@
"@angular/forms": ">=10.0.0"
}
},
"node_modules/ngx-text-editor": {
"version": "3.3.0",
"resolved": "git+ssh://git@github.com/MarmotteIntrepide/ngx-text-editor.git#ce2f4bbe72c9fc0124c92e846f439ce57446366a",
"license": "MIT",
"dependencies": {
"@angular/animations": "~13.3.11",
"@angular/common": "~13.3.11",
"@angular/compiler": "~13.3.11",
"@angular/core": "~13.3.11",
"@angular/forms": "~13.3.11",
"@angular/platform-browser": "~13.3.11",
"@angular/platform-browser-dynamic": "~13.3.11",
"@angular/platform-server": "~13.3.11",
"@angular/router": "~13.3.11",
"tslib": "^2.0.0"
},
"peerDependencies": {
"font-awesome": "^4.7.0",
"ngx-bootstrap": "~8.0.0",
"rxjs": "^7.4.0"
}
},
"node_modules/ngx-text-editor/node_modules/@angular/animations": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-13.3.11.tgz",
"integrity": "sha512-KE/3RuvixHIk9YTSwaUsezsUm9Ig9Y8rZMpHOT/8bRtzPiJ5ld2GnDHjrJgyZn7TdoP4wz4YCta5eC4ycu+KCw==",
"dependencies": {
"tslib": "^2.3.0"
},
"engines": {
"node": "^12.20.0 || ^14.15.0 || >=16.10.0"
},
"peerDependencies": {
"@angular/core": "13.3.11"
}
},
"node_modules/ngx-text-editor/node_modules/@angular/common": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-13.3.11.tgz",
"integrity": "sha512-gPMwDYIAag1izXm2tRQ6EOIx9FVEUqLdr+qYtRVoQtoBmfkoTSLGcpeBXqqlPVxVPbA6Li1WZZT5wxLLlLAN+Q==",
"dependencies": {
"tslib": "^2.3.0"
},
"engines": {
"node": "^12.20.0 || ^14.15.0 || >=16.10.0"
},
"peerDependencies": {
"@angular/core": "13.3.11",
"rxjs": "^6.5.3 || ^7.4.0"
}
},
"node_modules/ngx-text-editor/node_modules/@angular/compiler": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-13.3.11.tgz",
"integrity": "sha512-EV6JCBbXdHDHbPShWmymvuoxFYG0KVc8sDJpYp47WLHCY2zgZaXhvWs//Hrls3fmi+TGTekgRa2jOBBNce/Ggg==",
"dependencies": {
"tslib": "^2.3.0"
},
"engines": {
"node": "^12.20.0 || ^14.15.0 || >=16.10.0"
}
},
"node_modules/ngx-text-editor/node_modules/@angular/core": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-13.3.11.tgz",
"integrity": "sha512-9BmE2CxyV0g+AkBeuc8IwjSOiJ8Y+kptXnqD/J8EAFT3B0/fLGVnjFdZC6Sev9L0SNZb6qdzebpfIOLqbUjReQ==",
"dependencies": {
"tslib": "^2.3.0"
},
"engines": {
"node": "^12.20.0 || ^14.15.0 || >=16.10.0"
},
"peerDependencies": {
"rxjs": "^6.5.3 || ^7.4.0",
"zone.js": "~0.11.4"
}
},
"node_modules/ngx-text-editor/node_modules/@angular/forms": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-13.3.11.tgz",
"integrity": "sha512-iMgTNB+Qc3TsfAZSk1FnUE6MVoddPzxhG9AKCfSlvpjFh8VmXkIjxPL3dun7J8OjayT3X+B8f7LZ9AkKNXtBKw==",
"dependencies": {
"tslib": "^2.3.0"
},
"engines": {
"node": "^12.20.0 || ^14.15.0 || >=16.10.0"
},
"peerDependencies": {
"@angular/common": "13.3.11",
"@angular/core": "13.3.11",
"@angular/platform-browser": "13.3.11",
"rxjs": "^6.5.3 || ^7.4.0"
}
},
"node_modules/ngx-text-editor/node_modules/@angular/platform-browser": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-13.3.11.tgz",
"integrity": "sha512-PG3chCErARb6wNzkOed2NsZmgvTmbumRx/6sMXqGkDKXYQm0JULnl4X42Rn+JCgJ9DLJi5/jrd1dbcBCrKk9Vg==",
"dependencies": {
"tslib": "^2.3.0"
},
"engines": {
"node": "^12.20.0 || ^14.15.0 || >=16.10.0"
},
"peerDependencies": {
"@angular/animations": "13.3.11",
"@angular/common": "13.3.11",
"@angular/core": "13.3.11"
},
"peerDependenciesMeta": {
"@angular/animations": {
"optional": true
}
}
},
"node_modules/ngx-text-editor/node_modules/@angular/platform-browser-dynamic": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-13.3.11.tgz",
"integrity": "sha512-xM0VRC1Nw//SHO3gkghUHyjCaaQbk1UYMq4vIu3iKVq9KLqOSZgccv0NcOKHzXXN3S5RgX2auuyOUOCD6ny1Pg==",
"dependencies": {
"tslib": "^2.3.0"
},
"engines": {
"node": "^12.20.0 || ^14.15.0 || >=16.10.0"
},
"peerDependencies": {
"@angular/common": "13.3.11",
"@angular/compiler": "13.3.11",
"@angular/core": "13.3.11",
"@angular/platform-browser": "13.3.11"
}
},
"node_modules/ngx-text-editor/node_modules/@angular/platform-server": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-13.3.11.tgz",
"integrity": "sha512-Mm6UEYw+mn3pvxH/YeWO1D6DWMWMC8tInLdqEBrlPu/8oXQBrDCp+zpaT1v0uA5gzBltZ8QihLwsABifnSClaQ==",
"dependencies": {
"domino": "^2.1.2",
"tslib": "^2.3.0",
"xhr2": "^0.2.0"
},
"engines": {
"node": "^12.20.0 || ^14.15.0 || >=16.10.0"
},
"peerDependencies": {
"@angular/animations": "13.3.11",
"@angular/common": "13.3.11",
"@angular/compiler": "13.3.11",
"@angular/core": "13.3.11",
"@angular/platform-browser": "13.3.11",
"@angular/platform-browser-dynamic": "13.3.11"
}
},
"node_modules/ngx-text-editor/node_modules/@angular/router": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/router/-/router-13.3.11.tgz",
"integrity": "sha512-bJTcxDYKEyoqtsi1kJcDJWLmEN+dXpwhU07SsqUwfyN4V5fYF1ApDhpJ4c17hNdjEqe106srT9tiHXhmWayhmQ==",
"dependencies": {
"tslib": "^2.3.0"
},
"engines": {
"node": "^12.20.0 || ^14.15.0 || >=16.10.0"
},
"peerDependencies": {
"@angular/common": "13.3.11",
"@angular/core": "13.3.11",
"@angular/platform-browser": "13.3.11",
"rxjs": "^6.5.3 || ^7.4.0"
}
},
"node_modules/ngx-treeview": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/ngx-treeview/-/ngx-treeview-6.0.2.tgz",
...
...
@@ -17734,14 +17571,6 @@
}
}
},
"node_modules/xhr2": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz",
"integrity": "sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw==",
"engines": {
"node": ">= 6"
}
},
"node_modules/xml-js": {
"version": "1.6.11",
"resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
...
...
@@ -19640,6 +19469,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",
...
...
@@ -22637,11 +22474,6 @@
"domelementtype": "^2.2.0"
}
},
"domino": {
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz",
"integrity": "sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="
},
"domutils": {
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
...
...
@@ -26432,98 +26264,6 @@
"tslib": "^2.3.0"
}
},
"ngx-text-editor": {
"version": "git+ssh://git@github.com/MarmotteIntrepide/ngx-text-editor.git#ce2f4bbe72c9fc0124c92e846f439ce57446366a",
"from": "ngx-text-editor@git+https://github.com/MarmotteIntrepide/ngx-text-editor.git",
"requires": {
"@angular/animations": "~13.3.11",
"@angular/common": "~13.3.11",
"@angular/compiler": "~13.3.11",
"@angular/core": "~13.3.11",
"@angular/forms": "~13.3.11",
"@angular/platform-browser": "~13.3.11",
"@angular/platform-browser-dynamic": "~13.3.11",
"@angular/platform-server": "~13.3.11",
"@angular/router": "~13.3.11",
"tslib": "^2.0.0"
},
"dependencies": {
"@angular/animations": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-13.3.11.tgz",
"integrity": "sha512-KE/3RuvixHIk9YTSwaUsezsUm9Ig9Y8rZMpHOT/8bRtzPiJ5ld2GnDHjrJgyZn7TdoP4wz4YCta5eC4ycu+KCw==",
"requires": {
"tslib": "^2.3.0"
}
},
"@angular/common": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-13.3.11.tgz",
"integrity": "sha512-gPMwDYIAag1izXm2tRQ6EOIx9FVEUqLdr+qYtRVoQtoBmfkoTSLGcpeBXqqlPVxVPbA6Li1WZZT5wxLLlLAN+Q==",
"requires": {
"tslib": "^2.3.0"
}
},
"@angular/compiler": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-13.3.11.tgz",
"integrity": "sha512-EV6JCBbXdHDHbPShWmymvuoxFYG0KVc8sDJpYp47WLHCY2zgZaXhvWs//Hrls3fmi+TGTekgRa2jOBBNce/Ggg==",
"requires": {
"tslib": "^2.3.0"
}
},
"@angular/core": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-13.3.11.tgz",
"integrity": "sha512-9BmE2CxyV0g+AkBeuc8IwjSOiJ8Y+kptXnqD/J8EAFT3B0/fLGVnjFdZC6Sev9L0SNZb6qdzebpfIOLqbUjReQ==",
"requires": {
"tslib": "^2.3.0"
}
},
"@angular/forms": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-13.3.11.tgz",
"integrity": "sha512-iMgTNB+Qc3TsfAZSk1FnUE6MVoddPzxhG9AKCfSlvpjFh8VmXkIjxPL3dun7J8OjayT3X+B8f7LZ9AkKNXtBKw==",
"requires": {
"tslib": "^2.3.0"
}
},
"@angular/platform-browser": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-13.3.11.tgz",
"integrity": "sha512-PG3chCErARb6wNzkOed2NsZmgvTmbumRx/6sMXqGkDKXYQm0JULnl4X42Rn+JCgJ9DLJi5/jrd1dbcBCrKk9Vg==",
"requires": {
"tslib": "^2.3.0"
}
},
"@angular/platform-browser-dynamic": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-13.3.11.tgz",
"integrity": "sha512-xM0VRC1Nw//SHO3gkghUHyjCaaQbk1UYMq4vIu3iKVq9KLqOSZgccv0NcOKHzXXN3S5RgX2auuyOUOCD6ny1Pg==",
"requires": {
"tslib": "^2.3.0"
}
},
"@angular/platform-server": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-13.3.11.tgz",
"integrity": "sha512-Mm6UEYw+mn3pvxH/YeWO1D6DWMWMC8tInLdqEBrlPu/8oXQBrDCp+zpaT1v0uA5gzBltZ8QihLwsABifnSClaQ==",
"requires": {
"domino": "^2.1.2",
"tslib": "^2.3.0",
"xhr2": "^0.2.0"
}
},
"@angular/router": {
"version": "13.3.11",
"resolved": "https://registry.npmjs.org/@angular/router/-/router-13.3.11.tgz",
"integrity": "sha512-bJTcxDYKEyoqtsi1kJcDJWLmEN+dXpwhU07SsqUwfyN4V5fYF1ApDhpJ4c17hNdjEqe106srT9tiHXhmWayhmQ==",
"requires": {
"tslib": "^2.3.0"
}
}
}
},
"ngx-treeview": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/ngx-treeview/-/ngx-treeview-6.0.2.tgz",
...
...
@@ -31015,11 +30755,6 @@
"dev": true,
"requires": {}
},
"xhr2": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz",
"integrity": "sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw=="
},
"xml-js": {
"version": "1.6.11",
"resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
package-lock.json
deleted
100644 → 0
View file @
29825b98
This diff is collapsed.
Click to expand it.
package.json
View file @
2930f452
...
...
@@ -43,6 +43,7 @@
"
@angular/platform-browser
"
:
"
13.3.4
"
,
"
@angular/platform-browser-dynamic
"
:
"
13.3.4
"
,
"
@angular/router
"
:
"
13.3.4
"
,
"
@kolkov/angular-editor
"
:
"
^3.0.0-beta.0
"
,
"
@marmotteintrepide/ngx-bootstrap-slider
"
:
"
13.0.2
"
,
"
@ng-bootstrap/ng-bootstrap
"
:
"
^11.0.1
"
,
"
@ngx-pwa/local-storage
"
:
"
^13.0.2
"
,
...
...
@@ -69,8 +70,9 @@
"
ng2-dragula
"
:
"
^2.1.1
"
,
"
ngx-bootstrap
"
:
"
~8.0.0
"
,
"
ngx-color-picker
"
:
"
^11.0.0
"
,
"
ngx-editor
"
:
"
^13.0.0
"
,
"
ngx-i18nsupport
"
:
"
^0.17.1
"
,
"ngx-
text-editor"
:
"git+https://github.com/MarmotteIntrepide/ngx-text-editor.git
"
,
"
ngx-
mask
"
:
"
^13.1.15
"
,
"
ngx-treeview
"
:
"
^6.0.2
"
,
"
ngx-webstorage
"
:
"
^9.0.0
"
,
"
node-sass
"
:
"
^4.14.1
"
,
...
...
@@ -87,12 +89,10 @@
"
timers
"
:
"
^0.1.1
"
,
"
tslib
"
:
"
^2.0.0
"
,
"
turf-flatten
"
:
"
^1.0.0
"
,
"
typescript
"
:
"
4.4.3
"
,
"
w3c-schemas
"
:
"
^1.4.0
"
,
"
xml-js
"
:
"
^1.6.11
"
,
"
zone.js
"
:
"
~0.11.4
"
,
"
ngx-editor
"
:
"
^13.0.0
"
,
"
typescript
"
:
"
4.4.3
"
,
"
ngx-mask
"
:
"
^13.1.15
"
"
zone.js
"
:
"
~0.11.4
"
},
"devDependencies"
:
{
"
@angular-devkit/build-angular
"
:
"
~13.2.5
"
,
...
...
projects/visualiseur-core/package-lock.json
0 → 100644
View file @
2930f452
This diff is collapsed.
Click to expand it.
projects/visualiseur-core/package.json
View file @
2930f452
...
...
@@ -21,6 +21,7 @@
"angular-popper"
:
"^2.0.1"
,
"bootstrap"
:
"^4.3.1"
,
"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"
,
...
...
@@ -34,7 +35,6 @@
"ngx-bootstrap"
:
"~8.0.0"
,
"ngx-color-picker"
:
"^11.0.0"
,
"ngx-i18nsupport"
:
"^0.17.1"
,
"ngx-text-editor"
:
"git+https://github.com/MarmotteIntrepide/ngx-text-editor.git"
,
"ngx-treeview"
:
"^6.0.2"
,
"ngx-webstorage"
:
"^9.0.0"
,
"ogc-schemas"
:
"^2.6.1"
,
...
...
projects/visualiseur-core/src/lib/map/tools/editing-tools/pre-editing-modal/editing-modal/editing-modal.component.ts
View file @
2930f452
...
...
@@ -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
(),
});
...
...
projects/visualiseur-core/src/lib/modals/interrogating-mailing-modal/interrogating-mailing-modal.component.html
View file @
2930f452
...
...
@@ -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"
>
...
...
projects/visualiseur-core/src/lib/modals/interrogating-mailing-modal/interrogating-mailing-modal.component.ts
View file @
2930f452
...
...
@@ -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
})