From cba859376e36b6a6b3173654e2851fe3d4a35fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-=C3=89tienne=20Lord?= Date: Mon, 2 Oct 2023 09:45:39 -0400 Subject: [PATCH 1/4] chore(git): adding eol = lf to git attributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..4eb2283c18 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +text eol=lf \ No newline at end of file From 42c7961a4d46c2d30c6fd69ef71a7fb3e69be679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-=C3=89tienne=20Lord?= Date: Mon, 2 Oct 2023 09:57:31 -0400 Subject: [PATCH 2/4] chore(*): adding a plugin to prettier to sort imports --- .eslintrc.json | 2 +- .prettierrc | 7 +++- package-lock.json | 88 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + 4 files changed, 96 insertions(+), 2 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 75c471607f..7ccafded77 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -4,7 +4,7 @@ "overrides": [ { "files": ["*.ts"], - "plugins": ["unused-imports"], + "plugins": ["unused-imports","@trivago/prettier-plugin-sort-imports"], "extends": [ "plugin:@angular-eslint/recommended", "plugin:@angular-eslint/template/process-inline-templates" diff --git a/.prettierrc b/.prettierrc index b10dedda71..a280fba60e 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,10 @@ { "singleQuote": true, "trailingComma": "none", - "endOfLine": "lf" + "endOfLine": "lf", + "importOrder": ["^@angular/(.*)$", "^@igo2/(.*)$", "^ol/(.*)$", "", "^[./]"], + "importOrderSeparation": true, + "importOrderSortSpecifiers": true, + "importOrderParserPlugins": ["typescript", "decorators-legacy"], + "plugins": ["@trivago/prettier-plugin-sort-imports"] } diff --git a/package-lock.json b/package-lock.json index 2a19aafc7d..f7ee9113d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -72,6 +72,7 @@ "@angular/compiler-cli": "^16.2.5", "@compodoc/compodoc": "^1.1.15", "@cypress/schematic": "^2.5.1", + "@trivago/prettier-plugin-sort-imports": "^4.2.0", "@types/flexsearch": "^0.7.3", "@types/geojson": "^7946.0.10", "@types/hammerjs": "^2.0.36", @@ -5303,6 +5304,86 @@ "node": ">= 6" } }, + "node_modules/@trivago/prettier-plugin-sort-imports": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.2.0.tgz", + "integrity": "sha512-YBepjbt+ZNBVmN3ev1amQH3lWCmHyt5qTbLCp/syXJRu/Kw2koXh44qayB1gMRxcL/gV8egmjN5xWSrYyfUtyw==", + "dev": true, + "dependencies": { + "@babel/generator": "7.17.7", + "@babel/parser": "^7.20.5", + "@babel/traverse": "7.17.3", + "@babel/types": "7.17.0", + "javascript-natural-sort": "0.7.1", + "lodash": "^4.17.21" + }, + "peerDependencies": { + "@vue/compiler-sfc": "3.x", + "prettier": "2.x - 3.x" + }, + "peerDependenciesMeta": { + "@vue/compiler-sfc": { + "optional": true + } + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/generator": { + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz", + "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==", + "dev": true, + "dependencies": { + "@babel/types": "^7.17.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/traverse": { + "version": "7.17.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz", + "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.16.7", + "@babel/generator": "^7.17.3", + "@babel/helper-environment-visitor": "^7.16.7", + "@babel/helper-function-name": "^7.16.7", + "@babel/helper-hoist-variables": "^7.16.7", + "@babel/helper-split-export-declaration": "^7.16.7", + "@babel/parser": "^7.17.3", + "@babel/types": "^7.17.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/types": { + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz", + "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.16.7", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/@ts-morph/common": { "version": "0.19.0", "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.19.0.tgz", @@ -16704,6 +16785,12 @@ "colors": "1.4.0" } }, + "node_modules/javascript-natural-sort": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", + "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==", + "dev": true + }, "node_modules/jest-worker": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", @@ -28001,6 +28088,7 @@ "@angular/core": "^16.2.5", "@angular/material": "^16.2.4", "@angular/platform-browser": "^16.2.5", + "@floating-ui/utils": "^0.1.4", "@igo2/core": "^16.0.0-rc.0", "@igo2/utils": "^16.0.0-rc.0", "angular-shepherd": "16.0.0", diff --git a/package.json b/package.json index f2158a529d..a250b3e9a3 100644 --- a/package.json +++ b/package.json @@ -150,6 +150,7 @@ "@angular/compiler-cli": "^16.2.5", "@compodoc/compodoc": "^1.1.15", "@cypress/schematic": "^2.5.1", + "@trivago/prettier-plugin-sort-imports": "^4.2.0", "@types/flexsearch": "^0.7.3", "@types/geojson": "^7946.0.10", "@types/hammerjs": "^2.0.36", From 001e5fe987c7848d6dfdce3983d99de3b00a4fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-=C3=89tienne=20Lord?= Date: Mon, 2 Oct 2023 10:08:04 -0400 Subject: [PATCH 3/4] chore(*): format all files to sort imports --- demo/src/app/app.component.spec.ts | 7 +- demo/src/app/app.component.ts | 11 +- demo/src/app/app.module.ts | 78 ++++++----- .../auth-form/auth-form-routing.module.ts | 2 +- .../app/auth/auth-form/auth-form.module.ts | 4 +- .../common/action/action-routing.module.ts | 2 +- .../src/app/common/action/action.component.ts | 14 +- demo/src/app/common/action/action.module.ts | 4 +- .../dynamic-component-routing.module.ts | 2 +- .../dynamic-component.component.ts | 6 +- .../dynamic-component.module.ts | 8 +- .../entity-selector-routing.module.ts | 2 +- .../entity-selector.component.ts | 8 +- .../entity-selector/entity-selector.module.ts | 4 +- .../entity-table-routing.module.ts | 2 +- .../entity-table/entity-table.component.ts | 11 +- .../entity-table/entity-table.module.ts | 4 +- .../app/common/form/form-routing.module.ts | 2 +- demo/src/app/common/form/form.component.ts | 7 +- demo/src/app/common/form/form.module.ts | 4 +- .../app/common/table/table-routing.module.ts | 2 +- demo/src/app/common/table/table.component.ts | 2 +- demo/src/app/common/table/table.module.ts | 4 +- .../app/common/tool/tool-routing.module.ts | 2 +- demo/src/app/common/tool/tool.component.ts | 18 +-- demo/src/app/common/tool/tool.module.ts | 10 +- .../common/widget/widget-routing.module.ts | 2 +- .../src/app/common/widget/widget.component.ts | 8 +- demo/src/app/common/widget/widget.module.ts | 4 +- .../doc-viewer/doc-viewer.module.ts | 5 +- .../example-viewer.component.spec.ts | 4 +- .../app/components/example/example.module.ts | 12 +- .../context/context/context-routing.module.ts | 2 +- .../app/context/context/context.component.ts | 2 +- .../src/app/context/context/context.module.ts | 15 ++- .../core/activity/activity-routing.module.ts | 2 +- demo/src/app/core/activity/activity.module.ts | 6 +- .../app/core/config/config-routing.module.ts | 2 +- demo/src/app/core/config/config.component.ts | 1 + demo/src/app/core/config/config.module.ts | 5 +- demo/src/app/core/home/home-routing.module.ts | 2 +- demo/src/app/core/home/home.component.ts | 1 + demo/src/app/core/home/home.module.ts | 5 +- .../core/language/language-routing.module.ts | 2 +- .../app/core/language/language.component.ts | 1 + demo/src/app/core/language/language.module.ts | 4 +- .../app/core/media/media-routing.module.ts | 2 +- demo/src/app/core/media/media.module.ts | 4 +- .../core/message/message-routing.module.ts | 2 +- demo/src/app/core/message/message.module.ts | 4 +- .../core/request/request-routing.module.ts | 2 +- .../src/app/core/request/request.component.ts | 2 +- demo/src/app/core/request/request.module.ts | 6 +- .../app/geo/catalog/catalog-routing.module.ts | 2 +- demo/src/app/geo/catalog/catalog.component.ts | 8 +- demo/src/app/geo/catalog/catalog.module.ts | 8 +- .../directions/directions-routing.module.ts | 2 +- .../geo/directions/directions.component.ts | 7 +- .../app/geo/directions/directions.module.ts | 6 +- demo/src/app/geo/draw/draw-routing.module.ts | 2 +- demo/src/app/geo/draw/draw.component.ts | 4 +- demo/src/app/geo/draw/draw.module.ts | 6 +- .../app/geo/feature/feature-routing.module.ts | 2 +- demo/src/app/geo/feature/feature.component.ts | 10 +- demo/src/app/geo/feature/feature.module.ts | 8 +- .../geo/geometry/geometry-routing.module.ts | 2 +- .../app/geo/geometry/geometry.component.ts | 12 +- demo/src/app/geo/geometry/geometry.module.ts | 4 +- .../src/app/geo/hover/hover-routing.module.ts | 3 +- demo/src/app/geo/hover/hover.component.ts | 6 +- demo/src/app/geo/hover/hover.module.ts | 4 +- .../import-export-routing.module.ts | 2 +- .../import-export/import-export.component.ts | 2 +- .../geo/import-export/import-export.module.ts | 10 +- .../src/app/geo/layer/layer-routing.module.ts | 2 +- demo/src/app/geo/layer/layer.component.ts | 10 +- demo/src/app/geo/layer/layer.module.ts | 12 +- .../app/geo/legend/legend-routing.module.ts | 2 +- demo/src/app/geo/legend/legend.component.ts | 10 +- demo/src/app/geo/legend/legend.module.ts | 12 +- .../app/geo/measure/measure-routing.module.ts | 2 +- demo/src/app/geo/measure/measure.component.ts | 6 +- demo/src/app/geo/measure/measure.module.ts | 4 +- .../ogc-filter/ogc-filter-routing.module.ts | 2 +- .../geo/ogc-filter/ogc-filter.component.ts | 14 +- .../app/geo/ogc-filter/ogc-filter.module.ts | 6 +- .../app/geo/overlay/overlay-routing.module.ts | 2 +- demo/src/app/geo/overlay/overlay.component.ts | 8 +- demo/src/app/geo/overlay/overlay.module.ts | 4 +- .../src/app/geo/print/print-routing.module.ts | 2 +- demo/src/app/geo/print/print.module.ts | 4 +- .../src/app/geo/query/query-routing.module.ts | 2 +- demo/src/app/geo/query/query.component.ts | 29 ++--- demo/src/app/geo/query/query.module.ts | 8 +- .../app/geo/search/search-routing.module.ts | 2 +- demo/src/app/geo/search/search.component.ts | 11 +- demo/src/app/geo/search/search.module.ts | 23 ++-- .../simple-map/simple-map-routing.module.ts | 2 +- .../geo/simple-map/simple-map.component.ts | 2 +- .../app/geo/simple-map/simple-map.module.ts | 4 +- .../spatial-filter-routing.module.ts | 2 +- .../spatial-filter.component.ts | 40 +++--- .../spatial-filter/spatial-filter.module.ts | 16 +-- .../time-filter/time-filter-routing.module.ts | 2 +- .../geo/time-filter/time-filter.component.ts | 6 +- .../app/geo/time-filter/time-filter.module.ts | 6 +- .../geo/workspace/workspace-routing.module.ts | 2 +- .../app/geo/workspace/workspace.component.ts | 16 +-- .../src/app/geo/workspace/workspace.module.ts | 10 +- demo/src/app/shared/shared.module.ts | 9 +- demo/src/main.ts | 4 +- .../lib/auth-form/auth-facebook.component.ts | 9 +- .../src/lib/auth-form/auth-form.component.ts | 14 +- .../lib/auth-form/auth-google.component.ts | 9 +- .../lib/auth-form/auth-intern.component.ts | 13 +- .../lib/auth-form/auth-microsoft.component.ts | 29 +++-- .../auth-form/auth-microsoftb2c.component.ts | 28 ++-- packages/auth/src/lib/auth-routing.module.ts | 2 +- packages/auth/src/lib/auth.module.ts | 20 +-- packages/auth/src/lib/shared/admin.guard.ts | 3 +- .../src/lib/shared/auth-microsoft.provider.ts | 11 +- .../auth-msalBroadcastServiceb2c.service.ts | 5 +- .../shared/auth-msalServiceb2c.service..ts | 18 +-- packages/auth/src/lib/shared/auth.guard.ts | 3 +- .../auth/src/lib/shared/auth.interceptor.ts | 10 +- .../auth/src/lib/shared/auth.interface.ts | 2 +- .../auth/src/lib/shared/auth.service.spec.ts | 2 +- packages/auth/src/lib/shared/auth.service.ts | 12 +- packages/auth/src/lib/shared/logged.guard.ts | 3 +- packages/auth/src/lib/shared/profils.guard.ts | 6 +- .../src/lib/shared/protected.directive.ts | 1 + .../auth/src/lib/shared/storage.service.ts | 7 +- packages/auth/src/lib/shared/token.service.ts | 4 +- .../common/src/lib/action/action.module.ts | 2 +- .../actionbar/actionbar-item.component.ts | 8 +- .../action/actionbar/actionbar.component.ts | 20 +-- .../lib/action/actionbar/actionbar.module.ts | 5 +- .../lib/backdrop/backdrop.component.spec.ts | 2 +- .../src/lib/backdrop/backdrop.module.ts | 2 +- .../lib/badge-icon/badge-icon.directive.ts | 2 +- .../src/lib/badge-icon/badge-icon.module.ts | 5 +- .../src/lib/clickout/clickout.module.ts | 3 +- packages/common/src/lib/clone/clone.module.ts | 3 +- .../collapsible/collapse.directive.spec.ts | 2 +- .../src/lib/collapsible/collapse.directive.ts | 6 +- .../collapsible/collapsible.component.spec.ts | 7 +- .../lib/collapsible/collapsible.component.ts | 2 +- .../src/lib/collapsible/collapsible.module.ts | 2 +- .../color-picker-form-field.component.ts | 5 +- .../color-picker-form-field.module.ts | 3 +- .../confirm-dialog/confirm-dialog.module.ts | 2 +- .../confirm-dialog/confirm-dialog.service.ts | 1 + .../context-menu/context-menu.directive.ts | 6 +- .../lib/context-menu/context-menu.module.ts | 3 +- .../lib/context-menu/long-press.directive.ts | 7 +- .../src/lib/custom-html/custom-html.module.ts | 2 +- packages/common/src/lib/dom/dom.service.ts | 5 +- .../src/lib/drag-drop/drag-drop.directive.ts | 8 +- .../src/lib/drag-drop/drag-drop.module.ts | 3 +- .../dynamic-component.module.ts | 2 +- .../dynamic-outlet.component.ts | 8 +- .../dynamic-outlet/dynamic-outlet.module.ts | 2 +- .../entity-selector.component.ts | 12 +- .../entity-selector/entity-selector.module.ts | 3 +- .../entity-table-paginator.component.ts | 16 ++- .../entity-table-paginator.module.ts | 3 +- .../entity-table-row.directive.ts | 6 +- .../entity-table/entity-table.component.ts | 55 ++++---- .../entity-table/entity-table.module.ts | 25 ++-- .../common/src/lib/entity/entity.module.ts | 4 +- .../src/lib/entity/shared/store-strategy.ts | 2 +- .../common/src/lib/entity/shared/store.ts | 4 +- .../src/lib/entity/shared/transaction.ts | 11 +- packages/common/src/lib/entity/shared/view.ts | 9 +- .../common/src/lib/entity/shared/watcher.ts | 4 +- .../lib/flexible/flexible.component.spec.ts | 3 +- .../src/lib/flexible/flexible.component.ts | 13 +- .../src/lib/flexible/flexible.module.ts | 3 +- .../form-field/form-field-select.component.ts | 8 +- .../form-field/form-field-text.component.ts | 6 +- .../form-field-textarea.component.ts | 6 +- .../form/form-field/form-field.component.ts | 6 +- .../lib/form/form-field/form-field.module.ts | 6 +- .../form/form-group/form-group.component.ts | 4 +- .../lib/form/form-group/form-group.module.ts | 2 +- packages/common/src/lib/form/form.module.ts | 8 +- .../src/lib/form/form/form.component.ts | 10 +- .../common/src/lib/form/form/form.module.ts | 2 +- .../src/lib/form/shared/form.interfaces.ts | 1 + .../src/lib/form/shared/form.service.ts | 2 +- .../src/lib/home-button/home-button.module.ts | 6 +- .../src/lib/image/image-error.directive.ts | 2 +- packages/common/src/lib/image/image.module.ts | 3 +- .../common/src/lib/image/secure-image.pipe.ts | 7 +- .../interactive-tour.component.ts | 8 +- .../interactive-tour.loader.ts | 9 +- .../interactive-tour.module.ts | 7 +- .../interactive-tour.service.ts | 12 +- .../src/lib/json-dialog/json-dialog.module.ts | 3 +- .../src/lib/keyvalue/keyvalue.module.ts | 3 +- .../src/lib/list/list-item.directive.spec.ts | 1 + .../src/lib/list/list-item.directive.ts | 8 +- .../src/lib/list/list.component.spec.ts | 3 +- .../common/src/lib/list/list.component.ts | 10 +- packages/common/src/lib/list/list.module.ts | 3 +- .../src/lib/panel/panel.component.spec.ts | 2 +- .../common/src/lib/panel/panel.component.ts | 6 +- packages/common/src/lib/panel/panel.module.ts | 3 +- .../src/lib/sidenav/sidenav-shim.directive.ts | 2 +- .../common/src/lib/sidenav/sidenav.module.ts | 3 +- .../lib/spinner/spinner-activity.directive.ts | 6 +- .../src/lib/spinner/spinner.component.spec.ts | 3 +- .../common/src/lib/spinner/spinner.module.ts | 2 +- .../stop-propagation.module.ts | 3 +- .../common/src/lib/table/table-datasource.ts | 8 +- .../common/src/lib/table/table.component.ts | 20 +-- packages/common/src/lib/table/table.module.ts | 4 +- .../src/lib/tool/shared/tool.service.spec.ts | 2 +- .../common/src/lib/tool/shared/toolbox.ts | 3 +- packages/common/src/lib/tool/tool.module.ts | 2 +- .../src/lib/tool/toolbox/toolbox.animation.ts | 6 +- .../src/lib/tool/toolbox/toolbox.component.ts | 10 +- .../src/lib/tool/toolbox/toolbox.module.ts | 3 +- .../src/lib/widget/shared/widget.service.ts | 1 - .../widget-outlet/widget-outlet.component.ts | 9 +- .../widget-outlet/widget-outlet.module.ts | 3 +- .../common/src/lib/widget/widget.module.ts | 4 +- .../common/src/lib/workspace/shared/store.ts | 3 +- .../src/lib/workspace/shared/workspace.ts | 5 +- .../workspace-selector.component.ts | 8 +- .../workspace-selector.module.ts | 2 +- .../workspace-widget-outlet.component.ts | 6 +- .../workspace-widget-outlet.module.ts | 3 +- .../src/lib/workspace/workspace.module.ts | 2 +- .../context-import-export.module.ts | 12 +- .../context-import-export.component.ts | 25 ++-- .../shared/context-export.service.ts | 3 +- .../shared/context-export.utils.ts | 1 + .../shared/context-import.service.ts | 10 +- .../shared/context-import.utils.ts | 23 ++-- .../context-edit-binding.directive.ts | 13 +- .../context-edit/context-edit.component.ts | 6 +- .../context-form/context-form.component.ts | 5 +- .../context-item/context-item.component.ts | 9 +- .../context-list-binding.directive.ts | 19 +-- .../context-list/context-list.component.ts | 34 ++--- .../context-manager/context-manager.module.ts | 32 ++--- .../context-permissions-binding.directive.ts | 13 +- .../context-permissions.component.ts | 24 ++-- .../shared/context.interface.ts | 11 +- .../context-manager/shared/context.service.ts | 53 ++++---- .../shared/layer-context.directive.ts | 22 ++-- .../shared/map-context.directive.ts | 16 +-- .../bookmark-button.component.ts | 3 +- .../context-map-button.module.ts | 9 +- .../poi-button/poi-button.component.ts | 21 +-- .../poi-button/shared/poi.service.ts | 6 +- .../user-button/user-button.animation.ts | 6 +- .../user-button/user-button.component.ts | 4 +- .../user-button/user-dialog.component.ts | 2 +- packages/context/src/lib/context.module.ts | 2 +- .../src/lib/share-map/share-map.module.ts | 10 +- .../share-map/share-map-api.component.ts | 4 +- .../share-map/share-map-url.component.ts | 11 +- .../src/lib/sidenav/sidenav.component.ts | 2 +- .../context/src/lib/sidenav/sidenav.module.ts | 4 +- .../src/lib/activity/activity.interceptor.ts | 2 +- .../core/src/lib/activity/activity.module.ts | 2 +- .../core/src/lib/activity/activity.service.ts | 4 +- .../lib/analytics/shared/analytics.service.ts | 1 - .../lib/compression/compression.service.ts | 2 + .../core/src/lib/config/config-deprecated.ts | 2 +- packages/core/src/lib/config/config.module.ts | 5 +- .../core/src/lib/config/config.provider.ts | 2 +- .../src/lib/config/config.service.spec.ts | 2 +- .../core/src/lib/config/config.service.ts | 11 +- packages/core/src/lib/core.module.ts | 7 +- .../core/src/lib/gesture/gesture.module.ts | 4 +- .../core/src/lib/language/language.module.ts | 7 +- .../lib/language/shared/language.loader.ts | 5 +- .../lib/language/shared/language.provider.ts | 1 + .../language/shared/language.service.spec.ts | 2 +- .../lib/language/shared/language.service.ts | 1 + packages/core/src/lib/media/media.service.ts | 2 +- .../core/src/lib/message/message.module.ts | 2 +- .../lib/message/shared/message.interface.ts | 4 +- .../src/lib/message/shared/message.service.ts | 12 +- .../core/src/lib/network/network.service.ts | 3 +- packages/core/src/lib/regex/regex.service.ts | 1 + .../core/src/lib/request/error.interceptor.ts | 10 +- packages/core/src/lib/request/error.module.ts | 4 +- .../src/lib/request/logging.interceptor.ts | 8 +- .../core/src/lib/request/logging.module.ts | 2 +- .../core/src/lib/route/route.service.spec.ts | 3 +- packages/core/src/lib/route/route.service.ts | 3 +- .../core/src/lib/storage/storage.service.ts | 2 +- packages/core/src/lib/storage/storage.ts | 5 +- .../qcca/components/scrollbar.scss | 12 +- .../catalog-browser-group.component.ts | 14 +- .../catalog-browser-layer.component.ts | 17 +-- .../catalog-browser.component.ts | 24 ++-- .../catalog-browser/catalog-browser.module.ts | 15 +-- .../add-catalog-dialog.component.ts | 10 +- .../catalog-library-item.component.ts | 7 +- .../catalog-library.component.ts | 10 +- .../catalog-library/catalog-library.module.ts | 26 ++-- .../geo/src/lib/catalog/catalog.module.ts | 4 +- .../lib/catalog/shared/catalog.abstract.ts | 5 +- .../lib/catalog/shared/catalog.interface.ts | 3 +- .../src/lib/catalog/shared/catalog.service.ts | 27 ++-- .../geo/src/lib/catalog/shared/catalogs.ts | 1 + .../src/lib/datasource/datasource.module.ts | 2 +- .../shared/capabilities.service.spec.ts | 2 +- .../datasource/shared/capabilities.service.ts | 45 +++---- .../datasource/shared/datasource.service.ts | 56 ++++---- .../datasources/any-datasource.interface.ts | 20 +-- .../shared/datasources/any-datasource.ts | 22 ++-- .../datasources/arcgisrest-datasource.ts | 6 +- .../shared/datasources/carto-datasource.ts | 4 +- .../cluster-datasource.interface.ts | 2 +- .../shared/datasources/cluster-datasource.ts | 6 +- .../datasources/datasource.interface.ts | 6 +- .../shared/datasources/datasource.ts | 11 +- .../feature-datasource.interface.ts | 4 +- .../shared/datasources/feature-datasource.ts | 2 +- .../imagearcgisrest-datasource.interface.ts | 2 +- .../datasources/imagearcgisrest-datasource.ts | 3 +- .../shared/datasources/mvt-datasource.ts | 7 +- .../datasources/tilearcgisrest-datasource.ts | 2 +- .../tiledebug-datasource.interface.ts | 3 +- .../datasources/websocket-datasource.ts | 2 +- .../datasources/wfs-datasource.interface.ts | 5 +- .../shared/datasources/wfs-datasource.ts | 22 ++-- .../shared/datasources/wfs.service.ts | 20 +-- .../datasources/wms-datasource.interface.ts | 4 +- .../shared/datasources/wms-datasource.ts | 32 ++--- .../shared/datasources/wms-wfs.utils.ts | 10 +- .../datasources/wmts-datasource.interface.ts | 1 + .../datasources/xyz-datasource.interface.ts | 1 + .../shared/options/options-api.providers.ts | 2 +- .../shared/options/options-api.service.ts | 5 +- .../geo/src/lib/datasource/utils/tilegrid.ts | 4 +- .../directions-buttons.component.ts | 8 +- .../directions-inputs.component.ts | 19 +-- .../directions-results.component.ts | 17 +-- .../osrm-directions-source.ts | 13 +- .../lib/directions/directions.component.ts | 32 ++--- .../src/lib/directions/directions.module.ts | 13 +- .../directions/shared/directions.interface.ts | 8 +- .../directions/shared/directions.service.ts | 23 ++-- .../lib/directions/shared/directions.utils.ts | 32 ++--- .../geo/src/lib/directions/shared/store.ts | 2 + .../download-button.component.ts | 3 +- .../geo/src/lib/download/download.module.ts | 3 +- .../lib/download/shared/download.service.ts | 11 +- .../src/lib/draw/draw/draw-popup.component.ts | 30 +++-- .../geo/src/lib/draw/draw/draw.component.ts | 122 +++++++++--------- packages/geo/src/lib/draw/draw/draw.module.ts | 32 +++-- .../geo/src/lib/draw/drawingTool.module.ts | 1 + .../geo/src/lib/draw/shared/draw.interface.ts | 6 +- .../geo/src/lib/draw/shared/draw.utils.ts | 15 ++- .../feature-details.component.ts | 28 ++-- .../feature-details.directive.ts | 11 +- .../feature-details/feature-details.module.ts | 4 +- .../feature-form/feature-form.component.ts | 8 +- .../feature-form/feature-form.module.ts | 2 +- .../geo/src/lib/feature/feature.module.ts | 2 +- .../lib/feature/shared/feature.interfaces.ts | 13 +- .../src/lib/feature/shared/feature.utils.ts | 36 +++--- packages/geo/src/lib/feature/shared/store.ts | 11 +- .../lib/feature/shared/strategies.utils.ts | 2 +- .../shared/strategies/geo-properties.ts | 18 +-- .../shared/strategies/in-map-extent.ts | 5 +- .../shared/strategies/in-map-resolution.ts | 5 +- .../shared/strategies/loading-layer.ts | 8 +- .../lib/feature/shared/strategies/loading.ts | 4 +- .../lib/feature/shared/strategies/search.ts | 8 +- .../feature/shared/strategies/selection.ts | 15 +-- packages/geo/src/lib/filter/filter.module.ts | 56 ++++---- .../ogc-filter-button.component.ts | 6 +- .../ogc-filter-form.component.ts | 9 +- .../ogc-filter-selection.component.ts | 29 +++-- .../ogc-filter-time-slider.component.ts | 11 +- .../ogc-filter-time.component.ts | 17 +-- .../ogc-filterable-form.component.ts | 7 +- .../ogc-filterable-item.component.ts | 12 +- .../ogc-filterable-list-binding.directive.ts | 3 +- .../ogc-filterable-list.component.ts | 2 +- .../shared/filterable-datasource.pipe.ts | 3 +- .../filter/shared/ogc-filter-time.service.ts | 1 + .../lib/filter/shared/ogc-filter.interface.ts | 8 +- .../geo/src/lib/filter/shared/ogc-filter.ts | 27 ++-- .../filter/shared/spatial-filter.service.ts | 8 +- .../filter/shared/time-filter.interface.ts | 2 +- .../lib/filter/shared/time-filter.service.ts | 2 +- .../spatial-filter-item.component.ts | 57 ++++---- .../spatial-filter-list.component.ts | 31 +++-- .../spatial-filter-type.component.ts | 18 +-- .../time-filter-button.component.ts | 6 +- .../time-filter-form.component.ts | 10 +- .../time-filter-item.component.ts | 5 +- .../time-filter-list-binding.directive.ts | 3 +- .../time-filter-list.component.ts | 6 +- packages/geo/src/lib/geo.module.ts | 8 +- .../geometry-form-field-input.component.ts | 42 +++--- .../geometry-form-field.component.ts | 4 + .../geometry-form-field.module.ts | 4 +- .../geo/src/lib/geometry/geometry.module.ts | 2 +- .../src/lib/geometry/shared/controls/draw.ts | 20 +-- .../lib/geometry/shared/controls/modify.ts | 32 ++--- .../src/lib/geometry/shared/controls/slice.ts | 8 +- .../geometry/shared/geometry.interfaces.ts | 5 +- .../src/lib/geometry/shared/geometry.utils.ts | 13 +- .../export-button/export-button.component.ts | 7 +- .../lib/import-export/import-export.module.ts | 13 +- .../import-export/import-export.component.ts | 74 +++++------ .../shared/drop-geo-file.directive.ts | 28 ++-- .../import-export/shared/export.interface.ts | 2 +- .../import-export/shared/export.service.ts | 9 +- .../lib/import-export/shared/export.utils.ts | 4 +- .../import-export/shared/import.service.ts | 16 +-- .../lib/import-export/shared/import.utils.ts | 25 ++-- .../layer/layer-item/layer-item.component.ts | 18 +-- .../layer-legend-item.component.ts | 10 +- .../layer-legend-list-binding.directive.ts | 5 +- .../layer-legend-list.component.ts | 12 +- .../layer-legend/layer-legend.component.ts | 27 ++-- .../layer-list-tool.component.ts | 10 +- .../layer-list-binding.directive.ts | 10 +- .../layer/layer-list/layer-list.component.ts | 45 +++---- packages/geo/src/lib/layer/layer.module.ts | 22 ++-- .../geo/src/lib/layer/shared/layer.service.ts | 53 ++++---- .../shared/layers/any-layer.interface.ts | 2 +- .../src/lib/layer/shared/layers/any-layer.ts | 2 +- .../shared/layers/image-layer.interface.ts | 7 +- .../lib/layer/shared/layers/image-layer.ts | 16 +-- .../layer/shared/layers/layer.interface.ts | 5 +- .../geo/src/lib/layer/shared/layers/layer.ts | 19 ++- .../shared/layers/tile-layer.interface.ts | 18 ++- .../src/lib/layer/shared/layers/tile-layer.ts | 19 ++- .../shared/layers/vector-layer.interface.ts | 30 ++--- .../lib/layer/shared/layers/vector-layer.ts | 73 +++++------ .../layers/vectortile-layer.interface.ts | 11 +- .../layer/shared/layers/vectortile-layer.ts | 12 +- .../track-feature-button.component.ts | 2 +- .../geo/src/lib/layer/utils/image-watcher.ts | 6 +- .../geo/src/lib/layer/utils/tile-watcher.ts | 3 +- .../geo/src/lib/layer/utils/vector-watcher.ts | 4 +- .../baselayers-switcher.animation.ts | 6 +- .../baselayers-switcher.component.ts | 6 +- .../mini-basemap.component.ts | 14 +- .../geolocate-button.component.ts | 3 +- .../home-extent-button.component.ts | 8 +- .../map/map-browser/map-browser.component.ts | 11 +- .../map/map-center/map-center.component.ts | 4 +- packages/geo/src/lib/map/map.module.ts | 28 ++-- .../offline-button.component.ts | 1 + .../rotation-button.component.ts | 3 +- .../lib/map/shared/controllers/controller.ts | 2 +- .../lib/map/shared/controllers/geolocation.ts | 27 ++-- .../src/lib/map/shared/controllers/view.ts | 13 +- .../lib/map/shared/hover-feature.directive.ts | 45 ++++--- .../src/lib/map/shared/linkedLayers.utils.ts | 13 +- .../shared/map-pointer-position.directive.ts | 17 +-- .../geo/src/lib/map/shared/map.abstract.ts | 15 ++- packages/geo/src/lib/map/shared/map.ts | 41 +++--- packages/geo/src/lib/map/shared/map.utils.ts | 6 +- .../lib/map/shared/mapOffline.directive.ts | 11 +- .../src/lib/map/shared/projection.service.ts | 5 +- .../swipe-control/swipe-control.component.ts | 9 +- .../geo/src/lib/map/utils/layer-watcher.ts | 6 +- .../wake-lock-button.component.ts | 6 +- .../measure/measurer/measure-format.pipe.ts | 4 +- .../measurer/measurer-dialog.component.ts | 5 +- .../measurer/measurer-item.component.ts | 10 +- .../measure/measurer/measurer.component.ts | 59 +++++---- .../lib/measure/measurer/measurer.module.ts | 11 +- .../src/lib/measure/shared/measure.utils.ts | 15 ++- .../metadata-button.component.ts | 11 +- .../geo/src/lib/metadata/metadata.module.ts | 9 +- .../metadata/shared/metadata.service.spec.ts | 2 +- .../geoDB/configFileToGeoDB.service.ts | 13 +- .../src/lib/offline/geoDB/geoDB.service.ts | 9 +- .../lib/offline/layerDB/layerDB.service.ts | 4 +- .../lib/offline/shared/geo-network.service.ts | 6 +- .../geo/src/lib/overlay/overlay.module.ts | 2 +- .../lib/overlay/shared/overlay.directive.ts | 12 +- .../src/lib/overlay/shared/overlay.service.ts | 2 +- .../geo/src/lib/overlay/shared/overlay.ts | 5 +- .../print/print-form/print-form.component.ts | 12 +- packages/geo/src/lib/print/print.module.ts | 6 +- .../src/lib/print/print/print.component.ts | 11 +- .../src/lib/print/shared/print.interface.ts | 6 +- .../geo/src/lib/print/shared/print.service.ts | 30 ++--- packages/geo/src/lib/query/query.module.ts | 4 +- .../shared/query-search-source.providers.ts | 1 - .../lib/query/shared/query-search-source.ts | 3 +- .../src/lib/query/shared/query.directive.ts | 29 ++--- .../src/lib/query/shared/query.interfaces.ts | 9 +- .../lib/query/shared/query.service.spec.ts | 5 +- .../geo/src/lib/query/shared/query.service.ts | 42 +++--- .../search/search-bar/search-bar.component.ts | 23 ++-- .../search/search-bar/search-bar.module.ts | 3 +- .../search-bar/search-url-param.directive.ts | 4 +- .../save-feature-dialog.component.ts | 13 +- .../search-results-add-button.component.ts | 45 ++++--- .../search-results-item.component.ts | 13 +- .../search-results.component.ts | 25 ++-- .../search-results/search-results.module.ts | 21 ++- .../search-selector.component.ts | 10 +- .../search-selector/search-selector.module.ts | 3 +- .../search-settings.component.spec.ts | 20 +-- .../search-settings.component.ts | 26 ++-- .../search-settings/search-settings.module.ts | 5 +- packages/geo/src/lib/search/search.module.ts | 15 +-- .../search-pointer-summary.directive.ts | 43 +++--- .../shared/search-source-service.providers.ts | 2 +- .../search/shared/search-source.service.ts | 1 + .../lib/search/shared/search.interfaces.ts | 2 +- .../src/lib/search/shared/search.service.ts | 20 +-- .../geo/src/lib/search/shared/search.utils.ts | 2 +- .../shared/sources/cadastre.providers.ts | 2 +- .../src/lib/search/shared/sources/cadastre.ts | 19 ++- .../shared/sources/coordinates.providers.ts | 6 +- .../lib/search/shared/sources/coordinates.ts | 33 ++--- .../shared/sources/icherche.providers.ts | 8 +- .../src/lib/search/shared/sources/icherche.ts | 32 +++-- .../shared/sources/ilayer.interfaces.ts | 2 +- .../search/shared/sources/ilayer.providers.ts | 2 +- .../src/lib/search/shared/sources/ilayer.ts | 31 +++-- .../shared/sources/nominatim.providers.ts | 2 +- .../lib/search/shared/sources/nominatim.ts | 14 +- .../src/lib/search/shared/sources/source.ts | 7 +- .../shared/sources/storedqueries.providers.ts | 4 +- .../search/shared/sources/storedqueries.ts | 28 ++-- .../shared/sources/workspace.providers.ts | 1 + .../lib/search/shared/sources/workspace.ts | 17 ++- .../shared/datasource/esri-style-generator.ts | 2 +- .../lib/style/shared/feature/feature-style.ts | 5 +- .../overlay/overlay-marker-style.utils.ts | 2 +- .../shared/overlay/overlay-style.utils.ts | 5 +- .../style/shared/vector/commonVectorStyle.ts | 9 +- .../style/shared/vector/conversion.utils.ts | 2 +- .../shared/vector/vector-style.interface.ts | 3 +- .../lib/style/style-list/style-list.module.ts | 7 +- .../style/style-list/style-list.provider.ts | 2 +- .../style-list/style-list.service.spec.ts | 2 +- .../style/style-list/style-list.service.ts | 7 +- .../drawing/style-modal-drawing.component.ts | 6 +- .../style-modal-layer-button.component.ts | 4 +- .../layer/style-modal-layer.component.ts | 5 +- .../style/style-service/draw-style.service.ts | 3 +- .../lib/style/style-service/style.service.ts | 8 +- packages/geo/src/lib/style/style.module.ts | 10 +- packages/geo/src/lib/toast/toast.component.ts | 6 +- packages/geo/src/lib/toast/toast.module.ts | 4 +- packages/geo/src/lib/utils/id-generator.ts | 8 +- .../propertyTypeDetector.service.ts | 2 + .../geo/src/lib/wkt/shared/wkt.service.ts | 2 +- packages/geo/src/lib/wkt/wkt.module.ts | 2 +- .../confirmation-popup.component.ts | 5 +- .../confirmation-popup.module.ts | 2 +- .../shared/edition-workspace.service.ts | 31 ++--- .../lib/workspace/shared/edition-workspace.ts | 28 ++-- .../shared/feature-workspace.service.ts | 18 +-- .../lib/workspace/shared/feature-workspace.ts | 1 + .../workspace/shared/wfs-workspace.service.ts | 18 +-- .../src/lib/workspace/shared/wfs-workspace.ts | 1 + .../workspace/shared/wms-workspace.service.ts | 13 +- .../lib/workspace/shared/workspace.utils.ts | 27 ++-- .../ogc-filter/ogc-filter.component.ts | 8 +- .../widgets/ogc-filter/ogc-filter.module.ts | 2 +- .../workspace-selector.directive.ts | 33 +++-- .../workspace-selector.module.ts | 2 +- .../workspace-updator.directive.ts | 24 ++-- .../workspace-updator.module.ts | 2 +- .../geo/src/lib/workspace/workspace.module.ts | 10 +- .../about-tool/about-tool.component.spec.ts | 3 +- .../about/about-tool/about-tool.component.ts | 5 +- .../integration/src/lib/about/about.module.ts | 10 +- .../analytics/analytics-listener.service.ts | 24 ++-- .../catalog-browser-tool.component.ts | 17 ++- .../catalog-browser-tool.module.ts | 3 +- .../catalog-library-tool.component.ts | 12 +- .../catalog-library-tool.module.ts | 3 +- .../src/lib/catalog/catalog.module.ts | 2 +- .../context-editor-tool.component.ts | 1 + .../context-manager-tool.component.ts | 4 +- .../context-share-tool.component.ts | 2 +- .../src/lib/context/context.module.ts | 2 +- .../src/lib/context/context.state.ts | 6 +- .../directions-tool.component.ts | 9 +- .../src/lib/directions/directions.module.ts | 5 +- .../src/lib/directions/directions.state.ts | 8 +- .../integration/src/lib/draw/draw.module.ts | 1 + .../integration/src/lib/draw/draw.state.ts | 1 + .../drawing-tool/drawing-tool.component.ts | 7 +- .../draw/drawing-tool/drawing-tool.module.ts | 2 +- .../active-ogc-filter-tool.animation.ts | 6 +- .../active-ogc-filter-tool.component.ts | 4 +- .../active-time-filter-tool.animation.ts | 6 +- .../active-time-filter-tool.component.ts | 3 +- .../src/lib/filter/filter.module.ts | 13 +- .../spatial-filter-tool.component.ts | 57 ++++---- .../import-export-tool.component.ts | 12 +- .../lib/import-export/import-export.module.ts | 14 +- .../lib/import-export/import-export.state.ts | 3 +- .../integration/src/lib/integration.module.ts | 8 +- .../advanced-coordinates.component.ts | 43 +++--- .../advanced-map-tool.component.ts | 2 + .../advanced-swipe.component.ts | 6 +- .../src/lib/map/layer-list-tool.state.ts | 4 +- .../map-details-tool.component.ts | 19 +-- .../map-legend/map-legend-tool.component.ts | 23 ++-- .../map-proximity-tool.component.ts | 6 +- .../src/lib/map/map-proximity.state.ts | 32 ++--- .../lib/map/map-tool/map-tool.component.ts | 13 +- .../lib/map/map-tools/map-tools.component.ts | 28 ++-- .../integration/src/lib/map/map.module.ts | 50 +++---- packages/integration/src/lib/map/map.state.ts | 3 +- .../src/lib/measure/measure.state.ts | 1 + .../measurer-tool/measurer-tool.component.ts | 3 +- .../measurer-tool/measurer-tool.module.ts | 2 +- .../integration/src/lib/print/print.module.ts | 5 +- .../integration/src/lib/search/query.state.ts | 1 + .../search-bar-binding.directive.ts | 10 +- .../search-results-tool.component.ts | 61 +++++---- .../search-results-tool.module.ts | 13 +- .../src/lib/search/search.state.ts | 14 +- .../integration/src/lib/tool/tool.state.ts | 5 +- .../shared/edition-actions.service.ts | 17 +-- .../shared/feature-actions.service.ts | 17 +-- .../workspace/shared/wfs-actions.service.ts | 17 +-- .../lib/workspace/shared/workspace.utils.ts | 18 +-- .../workspace-button.component.ts | 11 +- .../src/lib/workspace/workspace.module.ts | 8 +- .../src/lib/workspace/workspace.state.ts | 19 +-- packages/utils/src/lib/change.ts | 2 +- scripts/src/locale-merge.ts | 1 + scripts/src/postbuild-common.ts | 1 + scripts/src/postbuild-core.ts | 5 +- scripts/src/postbuild-geo.ts | 1 + scripts/src/utils/style.utils.ts | 1 + 643 files changed, 3333 insertions(+), 3071 deletions(-) diff --git a/demo/src/app/app.component.spec.ts b/demo/src/app/app.component.spec.ts index 4cfd28da7f..f3981383be 100644 --- a/demo/src/app/app.component.spec.ts +++ b/demo/src/app/app.component.spec.ts @@ -1,14 +1,13 @@ import { TestBed, waitForAsync } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; - import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatIconModule } from '@angular/material/icon'; +import { MatIconTestingModule } from '@angular/material/icon/testing'; import { MatListModule } from '@angular/material/list'; import { MatSidenavModule } from '@angular/material/sidenav'; import { MatToolbarModule } from '@angular/material/toolbar'; -import { MatIconTestingModule } from '@angular/material/icon/testing'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; import { IgoAuthModule } from '@igo2/auth'; diff --git a/demo/src/app/app.component.ts b/demo/src/app/app.component.ts index 8baf1251f3..cbcf6e61b8 100644 --- a/demo/src/app/app.component.ts +++ b/demo/src/app/app.component.ts @@ -1,17 +1,18 @@ import { MediaMatcher } from '@angular/cdk/layout'; +import { DOCUMENT } from '@angular/common'; import { - OnInit, ChangeDetectorRef, Component, Inject, - OnDestroy + OnDestroy, + OnInit } from '@angular/core'; +import { NavigationEnd, Router } from '@angular/router'; -import { userAgent, DomUtils } from '@igo2/utils'; import { version } from '@igo2/core'; -import { NavigationEnd, Router } from '@angular/router'; +import { DomUtils, userAgent } from '@igo2/utils'; + import { delay, first } from 'rxjs'; -import { DOCUMENT } from '@angular/common'; @Component({ selector: 'app-root', diff --git a/demo/src/app/app.module.ts b/demo/src/app/app.module.ts index 9c9e47a160..71d7ee450e 100644 --- a/demo/src/app/app.module.ts +++ b/demo/src/app/app.module.ts @@ -1,69 +1,67 @@ -import { BrowserModule, DomSanitizer } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { DatePipe } from '@angular/common'; import { APP_INITIALIZER, ApplicationRef, Injector, NgModule } from '@angular/core'; -import { HammerModule } from '@angular/platform-browser'; import { MatButtonModule } from '@angular/material/button'; -import { MatIconRegistry, MatIconModule } from '@angular/material/icon'; +import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; +import { MatIconModule, MatIconRegistry } from '@angular/material/icon'; import { MatListModule } from '@angular/material/list'; import { MatSidenavModule } from '@angular/material/sidenav'; import { MatToolbarModule } from '@angular/material/toolbar'; -import { AppHomeModule } from './core/home/home.module'; -import { AppActivityModule } from './core/activity/activity.module'; -import { AppConfigModule } from './core/config/config.module'; -import { AppLanguageModule } from './core/language/language.module'; -import { AppMediaModule } from './core/media/media.module'; -import { AppMessageModule } from './core/message/message.module'; -import { AppRequestModule } from './core/request/request.module'; +import { + MAT_TOOLTIP_DEFAULT_OPTIONS, + MatTooltipDefaultOptions +} from '@angular/material/tooltip'; +import { BrowserModule, DomSanitizer } from '@angular/platform-browser'; +import { HammerModule } from '@angular/platform-browser'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + +import { IgoCoreModule, LanguageService } from '@igo2/core'; + +import { concatMap, first } from 'rxjs'; +import { AppRoutingModule } from './app-routing.module'; +import { AppComponent } from './app.component'; +import { AppAuthFormModule } from './auth/auth-form/auth-form.module'; import { AppActionModule } from './common/action/action.module'; import { AppDynamicComponentModule } from './common/dynamic-component/dynamic-component.module'; -import { AppEntityTableModule } from './common/entity-table/entity-table.module'; import { AppEntitySelectorModule } from './common/entity-selector/entity-selector.module'; +import { AppEntityTableModule } from './common/entity-table/entity-table.module'; import { AppFormModule } from './common/form/form.module'; import { AppTableModule } from './common/table/table.module'; import { AppToolModule } from './common/tool/tool.module'; import { AppWidgetModule } from './common/widget/widget.module'; - -import { AppAuthFormModule } from './auth/auth-form/auth-form.module'; - -import { AppSimpleMapModule } from './geo/simple-map/simple-map.module'; -import { AppLayerModule } from './geo/layer/layer.module'; -import { AppLegendModule } from './geo/legend/legend.module'; -import { AppOverlayModule } from './geo/overlay/overlay.module'; -import { AppGeometryModule } from './geo/geometry/geometry.module'; +import { AppContextModule } from './context/context/context.module'; +import { AppActivityModule } from './core/activity/activity.module'; +import { AppConfigModule } from './core/config/config.module'; +import { AppHomeModule } from './core/home/home.module'; +import { AppLanguageModule } from './core/language/language.module'; +import { AppMediaModule } from './core/media/media.module'; +import { AppMessageModule } from './core/message/message.module'; +import { AppRequestModule } from './core/request/request.module'; +import { AppCatalogModule } from './geo/catalog/catalog.module'; +import { AppDirectionsModule } from './geo/directions/directions.module'; +import { AppDrawModule } from './geo/draw/draw.module'; import { AppFeatureModule } from './geo/feature/feature.module'; +import { AppGeometryModule } from './geo/geometry/geometry.module'; import { AppHoverModule } from './geo/hover/hover.module'; +import { AppImportExport } from './geo/import-export/import-export.module'; +import { AppLayerModule } from './geo/layer/layer.module'; +import { AppLegendModule } from './geo/legend/legend.module'; import { AppMeasureModule } from './geo/measure/measure.module'; -import { AppDrawModule } from './geo/draw/draw.module'; +import { AppOgcFilterModule } from './geo/ogc-filter/ogc-filter.module'; +import { AppOverlayModule } from './geo/overlay/overlay.module'; +import { AppPrintModule } from './geo/print/print.module'; import { AppQueryModule } from './geo/query/query.module'; -import { AppCatalogModule } from './geo/catalog/catalog.module'; import { AppSearchModule } from './geo/search/search.module'; -import { AppPrintModule } from './geo/print/print.module'; -import { AppImportExport } from './geo/import-export/import-export.module'; -import { AppDirectionsModule } from './geo/directions/directions.module'; -import { AppTimeFilterModule } from './geo/time-filter/time-filter.module'; -import { AppOgcFilterModule } from './geo/ogc-filter/ogc-filter.module'; +import { AppSimpleMapModule } from './geo/simple-map/simple-map.module'; import { AppSpatialFilterModule } from './geo/spatial-filter/spatial-filter.module'; +import { AppTimeFilterModule } from './geo/time-filter/time-filter.module'; import { AppWorkspaceModule } from './geo/workspace/workspace.module'; -import { AppContextModule } from './context/context/context.module'; - -import { AppRoutingModule } from './app-routing.module'; -import { AppComponent } from './app.component'; -import { IgoCoreModule, LanguageService } from '@igo2/core'; -import { - MatTooltipDefaultOptions, - MAT_TOOLTIP_DEFAULT_OPTIONS -} from '@angular/material/tooltip'; -import { concatMap, first } from 'rxjs'; -import { DatePipe } from '@angular/common'; -import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; - export const defaultTooltipOptions: MatTooltipDefaultOptions = { showDelay: 500, hideDelay: 0, diff --git a/demo/src/app/auth/auth-form/auth-form-routing.module.ts b/demo/src/app/auth/auth-form/auth-form-routing.module.ts index 4b14c57d51..0c41e6d97a 100644 --- a/demo/src/app/auth/auth-form/auth-form-routing.module.ts +++ b/demo/src/app/auth/auth-form/auth-form-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppAuthFormComponent } from './auth-form.component'; diff --git a/demo/src/app/auth/auth-form/auth-form.module.ts b/demo/src/app/auth/auth-form/auth-form.module.ts index c0b0c55bf9..71723ffe52 100644 --- a/demo/src/app/auth/auth-form/auth-form.module.ts +++ b/demo/src/app/auth/auth-form/auth-form.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { IgoAuthModule } from '@igo2/auth'; -import { AppAuthFormComponent } from './auth-form.component'; -import { AppAuthFormRoutingModule } from './auth-form-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppAuthFormRoutingModule } from './auth-form-routing.module'; +import { AppAuthFormComponent } from './auth-form.component'; @NgModule({ declarations: [AppAuthFormComponent], diff --git a/demo/src/app/common/action/action-routing.module.ts b/demo/src/app/common/action/action-routing.module.ts index 2127a4100b..88f317c585 100644 --- a/demo/src/app/common/action/action-routing.module.ts +++ b/demo/src/app/common/action/action-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppActionComponent } from './action.component'; diff --git a/demo/src/app/common/action/action.component.ts b/demo/src/app/common/action/action.component.ts index ed933e9924..77fea72379 100644 --- a/demo/src/app/common/action/action.component.ts +++ b/demo/src/app/common/action/action.component.ts @@ -1,15 +1,15 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; - -import { BehaviorSubject } from 'rxjs'; +import { Overlay } from '@angular/cdk/overlay'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActionStore, ActionbarMode } from '@igo2/common'; import { + LanguageService, Media, MediaOrientation, - MediaService, - LanguageService + MediaService } from '@igo2/core'; -import { ActionStore, ActionbarMode } from '@igo2/common'; -import { Overlay } from '@angular/cdk/overlay'; + +import { BehaviorSubject } from 'rxjs'; @Component({ selector: 'app-action', diff --git a/demo/src/app/common/action/action.module.ts b/demo/src/app/common/action/action.module.ts index 46f5e118fe..e4ee6c3a64 100644 --- a/demo/src/app/common/action/action.module.ts +++ b/demo/src/app/common/action/action.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { IgoActionModule, IgoContextMenuModule } from '@igo2/common'; -import { AppActionComponent } from './action.component'; -import { AppActionRoutingModule } from './action-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppActionRoutingModule } from './action-routing.module'; +import { AppActionComponent } from './action.component'; @NgModule({ declarations: [AppActionComponent], diff --git a/demo/src/app/common/dynamic-component/dynamic-component-routing.module.ts b/demo/src/app/common/dynamic-component/dynamic-component-routing.module.ts index 70e32dd4dd..d86220c0f5 100644 --- a/demo/src/app/common/dynamic-component/dynamic-component-routing.module.ts +++ b/demo/src/app/common/dynamic-component/dynamic-component-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppDynamicComponentComponent } from './dynamic-component.component'; diff --git a/demo/src/app/common/dynamic-component/dynamic-component.component.ts b/demo/src/app/common/dynamic-component/dynamic-component.component.ts index 03fe675ae8..7464507b84 100644 --- a/demo/src/app/common/dynamic-component/dynamic-component.component.ts +++ b/demo/src/app/common/dynamic-component/dynamic-component.component.ts @@ -1,8 +1,8 @@ import { - Component, - Input, ChangeDetectionStrategy, - ChangeDetectorRef + ChangeDetectorRef, + Component, + Input } from '@angular/core'; import { OnUpdateInputs } from '@igo2/common'; diff --git a/demo/src/app/common/dynamic-component/dynamic-component.module.ts b/demo/src/app/common/dynamic-component/dynamic-component.module.ts index 413b15d4f5..63ca8b3ceb 100644 --- a/demo/src/app/common/dynamic-component/dynamic-component.module.ts +++ b/demo/src/app/common/dynamic-component/dynamic-component.module.ts @@ -2,13 +2,13 @@ import { NgModule } from '@angular/core'; import { IgoDynamicComponentModule } from '@igo2/common'; +import { SharedModule } from '../../shared/shared.module'; +import { AppDynamicComponentRoutingModule } from './dynamic-component-routing.module'; import { - AppSalutationComponent, + AppDynamicComponentComponent, AppExplanationComponent, - AppDynamicComponentComponent + AppSalutationComponent } from './dynamic-component.component'; -import { AppDynamicComponentRoutingModule } from './dynamic-component-routing.module'; -import { SharedModule } from '../../shared/shared.module'; @NgModule({ declarations: [ diff --git a/demo/src/app/common/entity-selector/entity-selector-routing.module.ts b/demo/src/app/common/entity-selector/entity-selector-routing.module.ts index c3c7bae2ca..5168ec0d13 100644 --- a/demo/src/app/common/entity-selector/entity-selector-routing.module.ts +++ b/demo/src/app/common/entity-selector/entity-selector-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppEntitySelectorComponent } from './entity-selector.component'; diff --git a/demo/src/app/common/entity-selector/entity-selector.component.ts b/demo/src/app/common/entity-selector/entity-selector.component.ts index 07cfc297fe..597c71c753 100644 --- a/demo/src/app/common/entity-selector/entity-selector.component.ts +++ b/demo/src/app/common/entity-selector/entity-selector.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; - -import { LanguageService } from '@igo2/core'; import { EntityStore } from '@igo2/common'; +import { LanguageService } from '@igo2/core'; + +import { BehaviorSubject } from 'rxjs'; interface DemoEntity { id: string; diff --git a/demo/src/app/common/entity-selector/entity-selector.module.ts b/demo/src/app/common/entity-selector/entity-selector.module.ts index 0c955ff97d..383101cbcf 100644 --- a/demo/src/app/common/entity-selector/entity-selector.module.ts +++ b/demo/src/app/common/entity-selector/entity-selector.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { IgoEntitySelectorModule } from '@igo2/common'; -import { AppEntitySelectorComponent } from './entity-selector.component'; -import { AppEntitySelectorRoutingModule } from './entity-selector-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppEntitySelectorRoutingModule } from './entity-selector-routing.module'; +import { AppEntitySelectorComponent } from './entity-selector.component'; @NgModule({ declarations: [AppEntitySelectorComponent], diff --git a/demo/src/app/common/entity-table/entity-table-routing.module.ts b/demo/src/app/common/entity-table/entity-table-routing.module.ts index d167f26e67..8c56aff7de 100644 --- a/demo/src/app/common/entity-table/entity-table-routing.module.ts +++ b/demo/src/app/common/entity-table/entity-table-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppEntityTableComponent } from './entity-table.component'; diff --git a/demo/src/app/common/entity-table/entity-table.component.ts b/demo/src/app/common/entity-table/entity-table.component.ts index 00514a3dce..bc2050a002 100644 --- a/demo/src/app/common/entity-table/entity-table.component.ts +++ b/demo/src/app/common/entity-table/entity-table.component.ts @@ -1,14 +1,15 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatPaginator } from '@angular/material/paginator'; -import { LanguageService } from '@igo2/core'; import { EntityStore, EntityTableButton, - getEntityProperty, EntityTableColumnRenderer, - EntityTablePaginatorOptions + EntityTablePaginatorOptions, + getEntityProperty } from '@igo2/common'; -import { MatPaginator } from '@angular/material/paginator'; +import { LanguageService } from '@igo2/core'; + import { BehaviorSubject } from 'rxjs'; @Component({ diff --git a/demo/src/app/common/entity-table/entity-table.module.ts b/demo/src/app/common/entity-table/entity-table.module.ts index b64971068d..a0c1e18523 100644 --- a/demo/src/app/common/entity-table/entity-table.module.ts +++ b/demo/src/app/common/entity-table/entity-table.module.ts @@ -5,9 +5,9 @@ import { IgoEntityTablePaginatorModule } from '@igo2/common'; -import { AppEntityTableComponent } from './entity-table.component'; -import { AppEntityTableRoutingModule } from './entity-table-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppEntityTableRoutingModule } from './entity-table-routing.module'; +import { AppEntityTableComponent } from './entity-table.component'; @NgModule({ declarations: [AppEntityTableComponent], diff --git a/demo/src/app/common/form/form-routing.module.ts b/demo/src/app/common/form/form-routing.module.ts index 394f119225..dbed32273a 100644 --- a/demo/src/app/common/form/form-routing.module.ts +++ b/demo/src/app/common/form/form-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppFormComponent } from './form.component'; diff --git a/demo/src/app/common/form/form.component.ts b/demo/src/app/common/form/form.component.ts index cdb9ca8e7f..54afc609f7 100644 --- a/demo/src/app/common/form/form.component.ts +++ b/demo/src/app/common/form/form.component.ts @@ -1,9 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Validators } from '@angular/forms'; -import { BehaviorSubject, Subscription } from 'rxjs'; -import { LanguageService } from '@igo2/core'; import { Form, FormService } from '@igo2/common'; +import { LanguageService } from '@igo2/core'; + +import { BehaviorSubject, Subscription } from 'rxjs'; @Component({ selector: 'app-form', diff --git a/demo/src/app/common/form/form.module.ts b/demo/src/app/common/form/form.module.ts index f830b1882d..dd2a7e70db 100644 --- a/demo/src/app/common/form/form.module.ts +++ b/demo/src/app/common/form/form.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { IgoFormModule } from '@igo2/common'; -import { AppFormComponent } from './form.component'; -import { AppFormRoutingModule } from './form-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppFormRoutingModule } from './form-routing.module'; +import { AppFormComponent } from './form.component'; @NgModule({ declarations: [AppFormComponent], diff --git a/demo/src/app/common/table/table-routing.module.ts b/demo/src/app/common/table/table-routing.module.ts index 5187c00668..5e1da6ed67 100644 --- a/demo/src/app/common/table/table-routing.module.ts +++ b/demo/src/app/common/table/table-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppTableComponent } from './table.component'; diff --git a/demo/src/app/common/table/table.component.ts b/demo/src/app/common/table/table.component.ts index 48a71362ba..5b75de2075 100644 --- a/demo/src/app/common/table/table.component.ts +++ b/demo/src/app/common/table/table.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; +import { TableActionColor, TableDatabase } from '@igo2/common'; import { LanguageService } from '@igo2/core'; -import { TableDatabase, TableActionColor } from '@igo2/common'; @Component({ selector: 'app-table', diff --git a/demo/src/app/common/table/table.module.ts b/demo/src/app/common/table/table.module.ts index 99596e3554..0f49e49348 100644 --- a/demo/src/app/common/table/table.module.ts +++ b/demo/src/app/common/table/table.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { IgoTableModule } from '@igo2/common'; -import { AppTableComponent } from './table.component'; -import { AppTableRoutingModule } from './table-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppTableRoutingModule } from './table-routing.module'; +import { AppTableComponent } from './table.component'; @NgModule({ declarations: [AppTableComponent], diff --git a/demo/src/app/common/tool/tool-routing.module.ts b/demo/src/app/common/tool/tool-routing.module.ts index 0dd33fd70a..5fc5b99c80 100644 --- a/demo/src/app/common/tool/tool-routing.module.ts +++ b/demo/src/app/common/tool/tool-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppToolComponent } from './tool.component'; diff --git a/demo/src/app/common/tool/tool.component.ts b/demo/src/app/common/tool/tool.component.ts index a04a45fd0b..f489be2810 100644 --- a/demo/src/app/common/tool/tool.component.ts +++ b/demo/src/app/common/tool/tool.component.ts @@ -1,22 +1,22 @@ import { + ChangeDetectionStrategy, + ChangeDetectorRef, Component, - OnInit, - OnDestroy, Input, - ChangeDetectionStrategy, - ChangeDetectorRef + OnDestroy, + OnInit } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; - -import { LanguageService } from '@igo2/core'; import { OnUpdateInputs, Tool, - Toolbox, ToolComponent, - ToolService + ToolService, + Toolbox } from '@igo2/common'; +import { LanguageService } from '@igo2/core'; + +import { BehaviorSubject } from 'rxjs'; @ToolComponent({ name: 'demo-salutation', diff --git a/demo/src/app/common/tool/tool.module.ts b/demo/src/app/common/tool/tool.module.ts index 167550c394..71402c2f13 100644 --- a/demo/src/app/common/tool/tool.module.ts +++ b/demo/src/app/common/tool/tool.module.ts @@ -1,15 +1,15 @@ import { NgModule } from '@angular/core'; -import { IgoLanguageModule } from '@igo2/core'; import { IgoPanelModule, IgoToolModule } from '@igo2/common'; +import { IgoLanguageModule } from '@igo2/core'; +import { SharedModule } from '../../shared/shared.module'; +import { AppToolRoutingModule } from './tool-routing.module'; import { - AppToolComponent, + AppAboutToolComponent, AppSalutationToolComponent, - AppAboutToolComponent + AppToolComponent } from './tool.component'; -import { AppToolRoutingModule } from './tool-routing.module'; -import { SharedModule } from '../../shared/shared.module'; @NgModule({ declarations: [ diff --git a/demo/src/app/common/widget/widget-routing.module.ts b/demo/src/app/common/widget/widget-routing.module.ts index 827dc338ed..8527f4c538 100644 --- a/demo/src/app/common/widget/widget-routing.module.ts +++ b/demo/src/app/common/widget/widget-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppWidgetComponent } from './widget.component'; diff --git a/demo/src/app/common/widget/widget.component.ts b/demo/src/app/common/widget/widget.component.ts index 950d13a5fe..0150185399 100644 --- a/demo/src/app/common/widget/widget.component.ts +++ b/demo/src/app/common/widget/widget.component.ts @@ -1,10 +1,10 @@ import { + ChangeDetectionStrategy, + ChangeDetectorRef, Component, - Input, - Output, EventEmitter, - ChangeDetectionStrategy, - ChangeDetectorRef + Input, + Output } from '@angular/core'; import { diff --git a/demo/src/app/common/widget/widget.module.ts b/demo/src/app/common/widget/widget.module.ts index abb0af3d11..465762ef97 100644 --- a/demo/src/app/common/widget/widget.module.ts +++ b/demo/src/app/common/widget/widget.module.ts @@ -4,12 +4,12 @@ import { MatCardModule } from '@angular/material/card'; import { IgoWidgetModule } from '@igo2/common'; +import { SharedModule } from '../../shared/shared.module'; +import { AppWidgetRoutingModule } from './widget-routing.module'; import { AppSalutationWidgetComponent, AppWidgetComponent } from './widget.component'; -import { AppWidgetRoutingModule } from './widget-routing.module'; -import { SharedModule } from '../../shared/shared.module'; @NgModule({ declarations: [AppSalutationWidgetComponent, AppWidgetComponent], diff --git a/demo/src/app/components/doc-viewer/doc-viewer.module.ts b/demo/src/app/components/doc-viewer/doc-viewer.module.ts index 28b91caa3d..7a02ae7e6f 100644 --- a/demo/src/app/components/doc-viewer/doc-viewer.module.ts +++ b/demo/src/app/components/doc-viewer/doc-viewer.module.ts @@ -1,8 +1,9 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { DocViewerComponent } from './doc-viewer.component'; +import { NgModule } from '@angular/core'; import { MatCardModule } from '@angular/material/card'; +import { DocViewerComponent } from './doc-viewer.component'; + @NgModule({ declarations: [DocViewerComponent], exports: [DocViewerComponent], diff --git a/demo/src/app/components/example/example-viewer/example-viewer.component.spec.ts b/demo/src/app/components/example/example-viewer/example-viewer.component.spec.ts index f35309d905..1fdfd6c240 100644 --- a/demo/src/app/components/example/example-viewer/example-viewer.component.spec.ts +++ b/demo/src/app/components/example/example-viewer/example-viewer.component.spec.ts @@ -1,9 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ExampleViewerComponent } from './example-viewer.component'; import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; +import { ExampleViewerComponent } from './example-viewer.component'; + describe('ExampleViewerComponent', () => { let component: ExampleViewerComponent; let fixture: ComponentFixture; diff --git a/demo/src/app/components/example/example.module.ts b/demo/src/app/components/example/example.module.ts index 5192ba6fa9..36f4380112 100644 --- a/demo/src/app/components/example/example.module.ts +++ b/demo/src/app/components/example/example.module.ts @@ -1,14 +1,14 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - -import { ExampleViewerComponent } from './example-viewer/example-viewer.component'; -import { ExampleSeeCodeComponent } from './example-see-code/example-see-code.component'; -import { MatDividerModule } from '@angular/material/divider'; -import { MatCardModule } from '@angular/material/card'; +import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { ExampleSeeCodeComponent } from './example-see-code/example-see-code.component'; +import { ExampleViewerComponent } from './example-viewer/example-viewer.component'; + @NgModule({ declarations: [ExampleViewerComponent, ExampleSeeCodeComponent], exports: [ExampleViewerComponent], diff --git a/demo/src/app/context/context/context-routing.module.ts b/demo/src/app/context/context/context-routing.module.ts index d25d5ff00d..dce5e94c64 100644 --- a/demo/src/app/context/context/context-routing.module.ts +++ b/demo/src/app/context/context/context-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppContextComponent } from './context.component'; diff --git a/demo/src/app/context/context/context.component.ts b/demo/src/app/context/context/context.component.ts index 202db3bc07..1a6f0f3694 100644 --- a/demo/src/app/context/context/context.component.ts +++ b/demo/src/app/context/context/context.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { ContextService } from '@igo2/context'; +import { ContextService } from '@igo2/context'; import { LanguageService } from '@igo2/core'; import { IgoMap, MapService } from '@igo2/geo'; diff --git a/demo/src/app/context/context/context.module.ts b/demo/src/app/context/context/context.module.ts index e488a768d7..b4fcb29aba 100644 --- a/demo/src/app/context/context/context.module.ts +++ b/demo/src/app/context/context/context.module.ts @@ -1,19 +1,20 @@ -import { NgModule } from '@angular/core'; import { HttpClientJsonpModule } from '@angular/common/http'; +import { NgModule } from '@angular/core'; + import { IgoPanelModule } from '@igo2/common'; +import { IgoContextModule } from '@igo2/context'; import { - IgoMapModule, + IgoFeatureModule, IgoLayerModule, + IgoMapModule, IgoMetadataModule, IgoOverlayModule, - IgoQueryModule, - IgoFeatureModule + IgoQueryModule } from '@igo2/geo'; -import { IgoContextModule } from '@igo2/context'; -import { AppContextComponent } from './context.component'; -import { AppContextRoutingModule } from './context-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppContextRoutingModule } from './context-routing.module'; +import { AppContextComponent } from './context.component'; @NgModule({ declarations: [AppContextComponent], diff --git a/demo/src/app/core/activity/activity-routing.module.ts b/demo/src/app/core/activity/activity-routing.module.ts index 625d5ab142..9b0c7222b1 100644 --- a/demo/src/app/core/activity/activity-routing.module.ts +++ b/demo/src/app/core/activity/activity-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppActivityComponent } from './activity.component'; diff --git a/demo/src/app/core/activity/activity.module.ts b/demo/src/app/core/activity/activity.module.ts index 9258d5be16..c385ee4716 100644 --- a/demo/src/app/core/activity/activity.module.ts +++ b/demo/src/app/core/activity/activity.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; -import { IgoActivityModule } from '@igo2/core'; import { IgoSpinnerModule } from '@igo2/common'; +import { IgoActivityModule } from '@igo2/core'; -import { AppActivityComponent } from './activity.component'; -import { AppActivityRoutingModule } from './activity-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppActivityRoutingModule } from './activity-routing.module'; +import { AppActivityComponent } from './activity.component'; @NgModule({ declarations: [AppActivityComponent], diff --git a/demo/src/app/core/config/config-routing.module.ts b/demo/src/app/core/config/config-routing.module.ts index faa742480d..3d179fd2b3 100644 --- a/demo/src/app/core/config/config-routing.module.ts +++ b/demo/src/app/core/config/config-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppConfigComponent } from './config.component'; diff --git a/demo/src/app/core/config/config.component.ts b/demo/src/app/core/config/config.component.ts index 02a8e80e24..68d0f6ca34 100644 --- a/demo/src/app/core/config/config.component.ts +++ b/demo/src/app/core/config/config.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; + import { ConfigService, LanguageOptions } from '@igo2/core'; @Component({ diff --git a/demo/src/app/core/config/config.module.ts b/demo/src/app/core/config/config.module.ts index afca26d1aa..a5d7ae2f80 100644 --- a/demo/src/app/core/config/config.module.ts +++ b/demo/src/app/core/config/config.module.ts @@ -1,10 +1,11 @@ import { NgModule } from '@angular/core'; + import { IgoConfigModule, provideConfigOptions } from '@igo2/core'; import { environment } from '../../../environments/environment'; -import { AppConfigComponent } from './config.component'; -import { AppConfigRoutingModule } from './config-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppConfigRoutingModule } from './config-routing.module'; +import { AppConfigComponent } from './config.component'; @NgModule({ declarations: [AppConfigComponent], diff --git a/demo/src/app/core/home/home-routing.module.ts b/demo/src/app/core/home/home-routing.module.ts index 6eeeb2b53f..0ddfce6631 100644 --- a/demo/src/app/core/home/home-routing.module.ts +++ b/demo/src/app/core/home/home-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppHomeComponent } from './home.component'; diff --git a/demo/src/app/core/home/home.component.ts b/demo/src/app/core/home/home.component.ts index 9dd4f69e28..58d1562608 100644 --- a/demo/src/app/core/home/home.component.ts +++ b/demo/src/app/core/home/home.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; + import { InteractiveTourService } from '@igo2/common'; @Component({ diff --git a/demo/src/app/core/home/home.module.ts b/demo/src/app/core/home/home.module.ts index b700b014ab..ff4efc1e35 100644 --- a/demo/src/app/core/home/home.module.ts +++ b/demo/src/app/core/home/home.module.ts @@ -1,9 +1,10 @@ import { NgModule } from '@angular/core'; -import { AppHomeComponent } from './home.component'; -import { AppHomeRoutingModule } from './home-routing.module'; import { IgoInteractiveTourModule } from '@igo2/common'; + import { SharedModule } from '../../shared/shared.module'; +import { AppHomeRoutingModule } from './home-routing.module'; +import { AppHomeComponent } from './home.component'; @NgModule({ declarations: [AppHomeComponent], diff --git a/demo/src/app/core/language/language-routing.module.ts b/demo/src/app/core/language/language-routing.module.ts index c70844c201..a6ee064ca1 100644 --- a/demo/src/app/core/language/language-routing.module.ts +++ b/demo/src/app/core/language/language-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppLanguageComponent } from './language.component'; diff --git a/demo/src/app/core/language/language.component.ts b/demo/src/app/core/language/language.component.ts index 80cd765c3f..04624d0ef1 100644 --- a/demo/src/app/core/language/language.component.ts +++ b/demo/src/app/core/language/language.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; + import { LanguageService } from '@igo2/core'; @Component({ diff --git a/demo/src/app/core/language/language.module.ts b/demo/src/app/core/language/language.module.ts index 08bacbc7ae..f84e0d1390 100644 --- a/demo/src/app/core/language/language.module.ts +++ b/demo/src/app/core/language/language.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { IgoLanguageModule } from '@igo2/core'; -import { AppLanguageComponent } from './language.component'; -import { AppLanguageRoutingModule } from './language-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppLanguageRoutingModule } from './language-routing.module'; +import { AppLanguageComponent } from './language.component'; @NgModule({ declarations: [AppLanguageComponent], diff --git a/demo/src/app/core/media/media-routing.module.ts b/demo/src/app/core/media/media-routing.module.ts index 3ac6f24c70..36e25f52c7 100644 --- a/demo/src/app/core/media/media-routing.module.ts +++ b/demo/src/app/core/media/media-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppMediaComponent } from './media.component'; diff --git a/demo/src/app/core/media/media.module.ts b/demo/src/app/core/media/media.module.ts index a693593693..ed20197fbe 100644 --- a/demo/src/app/core/media/media.module.ts +++ b/demo/src/app/core/media/media.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; -import { AppMediaComponent } from './media.component'; -import { AppMediaRoutingModule } from './media-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppMediaRoutingModule } from './media-routing.module'; +import { AppMediaComponent } from './media.component'; @NgModule({ declarations: [AppMediaComponent], diff --git a/demo/src/app/core/message/message-routing.module.ts b/demo/src/app/core/message/message-routing.module.ts index c28f8d577c..ea8628ed63 100644 --- a/demo/src/app/core/message/message-routing.module.ts +++ b/demo/src/app/core/message/message-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppMessageComponent } from './message.component'; diff --git a/demo/src/app/core/message/message.module.ts b/demo/src/app/core/message/message.module.ts index 75375a6f9f..1386f76f00 100644 --- a/demo/src/app/core/message/message.module.ts +++ b/demo/src/app/core/message/message.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { IgoMessageModule } from '@igo2/core'; -import { AppMessageComponent } from './message.component'; -import { AppMessageRoutingModule } from './message-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppMessageRoutingModule } from './message-routing.module'; +import { AppMessageComponent } from './message.component'; @NgModule({ declarations: [AppMessageComponent], diff --git a/demo/src/app/core/request/request-routing.module.ts b/demo/src/app/core/request/request-routing.module.ts index ce9fd662f7..7a6c26b5e3 100644 --- a/demo/src/app/core/request/request-routing.module.ts +++ b/demo/src/app/core/request/request-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppRequestComponent } from './request.component'; diff --git a/demo/src/app/core/request/request.component.ts b/demo/src/app/core/request/request.component.ts index 7be91337bb..b332f6669c 100644 --- a/demo/src/app/core/request/request.component.ts +++ b/demo/src/app/core/request/request.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; import { HttpClient } from '@angular/common/http'; +import { Component } from '@angular/core'; import { LanguageService } from '@igo2/core'; diff --git a/demo/src/app/core/request/request.module.ts b/demo/src/app/core/request/request.module.ts index 47a2e6cf98..5d9e38f9ac 100644 --- a/demo/src/app/core/request/request.module.ts +++ b/demo/src/app/core/request/request.module.ts @@ -1,11 +1,11 @@ -import { NgModule } from '@angular/core'; import { HttpClientModule } from '@angular/common/http'; +import { NgModule } from '@angular/core'; import { IgoErrorModule, IgoLanguageModule } from '@igo2/core'; -import { AppRequestComponent } from './request.component'; -import { AppRequestRoutingModule } from './request-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppRequestRoutingModule } from './request-routing.module'; +import { AppRequestComponent } from './request.component'; @NgModule({ declarations: [AppRequestComponent], diff --git a/demo/src/app/geo/catalog/catalog-routing.module.ts b/demo/src/app/geo/catalog/catalog-routing.module.ts index 5103d4b59d..1b8ded11e6 100644 --- a/demo/src/app/geo/catalog/catalog-routing.module.ts +++ b/demo/src/app/geo/catalog/catalog-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppCatalogComponent } from './catalog.component'; diff --git a/demo/src/app/geo/catalog/catalog.component.ts b/demo/src/app/geo/catalog/catalog.component.ts index 82a1e5af5a..f8f7a8fd25 100644 --- a/demo/src/app/geo/catalog/catalog.component.ts +++ b/demo/src/app/geo/catalog/catalog.component.ts @@ -1,15 +1,15 @@ import { Component, OnInit } from '@angular/core'; -import { LanguageService, ConfigService, StorageService } from '@igo2/core'; +import { EntityRecord, EntityStore } from '@igo2/common'; +import { ConfigService, LanguageService, StorageService } from '@igo2/core'; import { - IgoMap, - LayerService, Catalog, CatalogItem, CatalogService, + IgoMap, + LayerService, MapService } from '@igo2/geo'; -import { EntityRecord, EntityStore } from '@igo2/common'; @Component({ selector: 'app-catalog', diff --git a/demo/src/app/geo/catalog/catalog.module.ts b/demo/src/app/geo/catalog/catalog.module.ts index 6291195155..7eb2322da3 100644 --- a/demo/src/app/geo/catalog/catalog.module.ts +++ b/demo/src/app/geo/catalog/catalog.module.ts @@ -1,13 +1,13 @@ import { NgModule } from '@angular/core'; -import { IgoConfigModule, provideConfigOptions } from '@igo2/core'; import { IgoPanelModule } from '@igo2/common'; -import { IgoMapModule, IgoCatalogModule } from '@igo2/geo'; +import { IgoConfigModule, provideConfigOptions } from '@igo2/core'; +import { IgoCatalogModule, IgoMapModule } from '@igo2/geo'; import { environment } from '../../../environments/environment'; -import { AppCatalogComponent } from './catalog.component'; -import { AppCatalogRoutingModule } from './catalog-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppCatalogRoutingModule } from './catalog-routing.module'; +import { AppCatalogComponent } from './catalog.component'; @NgModule({ declarations: [AppCatalogComponent], diff --git a/demo/src/app/geo/directions/directions-routing.module.ts b/demo/src/app/geo/directions/directions-routing.module.ts index 277825fd0e..20613010eb 100644 --- a/demo/src/app/geo/directions/directions-routing.module.ts +++ b/demo/src/app/geo/directions/directions-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppDirectionsComponent } from './directions.component'; diff --git a/demo/src/app/geo/directions/directions.component.ts b/demo/src/app/geo/directions/directions.component.ts index 0fe5f84920..7a99d69a99 100644 --- a/demo/src/app/geo/directions/directions.component.ts +++ b/demo/src/app/geo/directions/directions.component.ts @@ -6,11 +6,12 @@ import { LayerService, MapService, ProjectionService, - StopsStore, - StopsFeatureStore, RoutesFeatureStore, - StepFeatureStore + StepFeatureStore, + StopsFeatureStore, + StopsStore } from '@igo2/geo'; + import { Subject } from 'rxjs'; @Component({ diff --git a/demo/src/app/geo/directions/directions.module.ts b/demo/src/app/geo/directions/directions.module.ts index 7f0af6906c..fd604a993b 100644 --- a/demo/src/app/geo/directions/directions.module.ts +++ b/demo/src/app/geo/directions/directions.module.ts @@ -2,14 +2,14 @@ import { NgModule } from '@angular/core'; import { IgoMessageModule } from '@igo2/core'; import { - IgoMapModule, IgoDirectionsModule, + IgoMapModule, provideOsrmDirectionsSource } from '@igo2/geo'; -import { AppDirectionsComponent } from './directions.component'; -import { AppDirectionsRoutingModule } from './directions-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppDirectionsRoutingModule } from './directions-routing.module'; +import { AppDirectionsComponent } from './directions.component'; @NgModule({ declarations: [AppDirectionsComponent], diff --git a/demo/src/app/geo/draw/draw-routing.module.ts b/demo/src/app/geo/draw/draw-routing.module.ts index a07dade302..528a6d7898 100644 --- a/demo/src/app/geo/draw/draw-routing.module.ts +++ b/demo/src/app/geo/draw/draw-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppDrawComponent } from './draw.component'; diff --git a/demo/src/app/geo/draw/draw.component.ts b/demo/src/app/geo/draw/draw.component.ts index cbfef1edfe..e1ed74d4a6 100644 --- a/demo/src/app/geo/draw/draw.component.ts +++ b/demo/src/app/geo/draw/draw.component.ts @@ -2,11 +2,11 @@ import { Component } from '@angular/core'; import { LanguageService } from '@igo2/core'; import { - IgoMap, DataSourceService, - LayerService, FeatureStore, FeatureWithDraw, + IgoMap, + LayerService, MapService } from '@igo2/geo'; diff --git a/demo/src/app/geo/draw/draw.module.ts b/demo/src/app/geo/draw/draw.module.ts index 03795b391b..86acae0317 100644 --- a/demo/src/app/geo/draw/draw.module.ts +++ b/demo/src/app/geo/draw/draw.module.ts @@ -1,10 +1,10 @@ import { NgModule } from '@angular/core'; -import { IgoMapModule, IgoDrawModule } from '@igo2/geo'; +import { IgoDrawModule, IgoMapModule } from '@igo2/geo'; -import { AppDrawComponent } from './draw.component'; -import { AppDrawRoutingModule } from './draw-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppDrawRoutingModule } from './draw-routing.module'; +import { AppDrawComponent } from './draw.component'; @NgModule({ declarations: [AppDrawComponent], diff --git a/demo/src/app/geo/feature/feature-routing.module.ts b/demo/src/app/geo/feature/feature-routing.module.ts index 5359a2d3a0..be5210959b 100644 --- a/demo/src/app/geo/feature/feature-routing.module.ts +++ b/demo/src/app/geo/feature/feature-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppFeatureComponent } from './feature.component'; diff --git a/demo/src/app/geo/feature/feature.component.ts b/demo/src/app/geo/feature/feature.component.ts index bc3ca1f7dc..602ef4830b 100644 --- a/demo/src/app/geo/feature/feature.component.ts +++ b/demo/src/app/geo/feature/feature.component.ts @@ -1,15 +1,15 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { LanguageService } from '@igo2/core'; import { - IgoMap, DataSourceService, - LayerService, - VectorLayer, + FeatureMotion, FeatureStore, FeatureStoreLoadingStrategy, FeatureStoreSelectionStrategy, - FeatureMotion + IgoMap, + LayerService, + VectorLayer } from '@igo2/geo'; @Component({ diff --git a/demo/src/app/geo/feature/feature.module.ts b/demo/src/app/geo/feature/feature.module.ts index 2e4970903d..5b938531f3 100644 --- a/demo/src/app/geo/feature/feature.module.ts +++ b/demo/src/app/geo/feature/feature.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; -import { IgoPanelModule, IgoEntityTableModule } from '@igo2/common'; -import { IgoMapModule, IgoFeatureModule } from '@igo2/geo'; +import { IgoEntityTableModule, IgoPanelModule } from '@igo2/common'; +import { IgoFeatureModule, IgoMapModule } from '@igo2/geo'; -import { AppFeatureComponent } from './feature.component'; -import { AppFeatureRoutingModule } from './feature-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppFeatureRoutingModule } from './feature-routing.module'; +import { AppFeatureComponent } from './feature.component'; @NgModule({ declarations: [AppFeatureComponent], diff --git a/demo/src/app/geo/geometry/geometry-routing.module.ts b/demo/src/app/geo/geometry/geometry-routing.module.ts index ab5157ecb4..9510d86a97 100644 --- a/demo/src/app/geo/geometry/geometry-routing.module.ts +++ b/demo/src/app/geo/geometry/geometry-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppGeometryComponent } from './geometry.component'; diff --git a/demo/src/app/geo/geometry/geometry.component.ts b/demo/src/app/geo/geometry/geometry.component.ts index 6bf21a254f..dd9aed0dd1 100644 --- a/demo/src/app/geo/geometry/geometry.component.ts +++ b/demo/src/app/geo/geometry/geometry.component.ts @@ -1,11 +1,13 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Validators } from '@angular/forms'; -import { BehaviorSubject, Subscription } from 'rxjs'; -import * as olstyle from 'ol/style'; -import { LanguageService } from '@igo2/core'; import { Form, FormService } from '@igo2/common'; -import { IgoMap, DataSourceService, LayerService } from '@igo2/geo'; +import { LanguageService } from '@igo2/core'; +import { DataSourceService, IgoMap, LayerService } from '@igo2/geo'; + +import * as olstyle from 'ol/style'; + +import { BehaviorSubject, Subscription } from 'rxjs'; @Component({ selector: 'app-geometry', diff --git a/demo/src/app/geo/geometry/geometry.module.ts b/demo/src/app/geo/geometry/geometry.module.ts index 75e2c8122e..f068b7865a 100644 --- a/demo/src/app/geo/geometry/geometry.module.ts +++ b/demo/src/app/geo/geometry/geometry.module.ts @@ -3,9 +3,9 @@ import { NgModule } from '@angular/core'; import { IgoFormModule } from '@igo2/common'; import { IgoGeometryModule, IgoMapModule } from '@igo2/geo'; -import { AppGeometryComponent } from './geometry.component'; -import { AppGeometryRoutingModule } from './geometry-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppGeometryRoutingModule } from './geometry-routing.module'; +import { AppGeometryComponent } from './geometry.component'; @NgModule({ declarations: [AppGeometryComponent], diff --git a/demo/src/app/geo/hover/hover-routing.module.ts b/demo/src/app/geo/hover/hover-routing.module.ts index 86275d58df..61e686d2f6 100644 --- a/demo/src/app/geo/hover/hover-routing.module.ts +++ b/demo/src/app/geo/hover/hover-routing.module.ts @@ -1,4 +1,5 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; + import { AppHoverComponent } from './hover.component'; const routes: Routes = [ diff --git a/demo/src/app/geo/hover/hover.component.ts b/demo/src/app/geo/hover/hover.component.ts index 8c6d11b60e..2671b8990d 100644 --- a/demo/src/app/geo/hover/hover.component.ts +++ b/demo/src/app/geo/hover/hover.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { LanguageService, MediaService } from '@igo2/core'; import { - IgoMap, DataSourceService, + IgoMap, LayerService, - WFSDataSourceOptions, VectorLayerOptions, - WFSDataSource + WFSDataSource, + WFSDataSourceOptions } from '@igo2/geo'; @Component({ diff --git a/demo/src/app/geo/hover/hover.module.ts b/demo/src/app/geo/hover/hover.module.ts index ac39096b0f..adb38d0d92 100644 --- a/demo/src/app/geo/hover/hover.module.ts +++ b/demo/src/app/geo/hover/hover.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { IgoMapModule } from '@igo2/geo'; -import { AppHoverComponent } from './hover.component'; -import { AppHoverRoutingModule } from './hover-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppHoverRoutingModule } from './hover-routing.module'; +import { AppHoverComponent } from './hover.component'; @NgModule({ declarations: [AppHoverComponent], diff --git a/demo/src/app/geo/import-export/import-export-routing.module.ts b/demo/src/app/geo/import-export/import-export-routing.module.ts index 9dece43763..dfa84c37db 100644 --- a/demo/src/app/geo/import-export/import-export-routing.module.ts +++ b/demo/src/app/geo/import-export/import-export-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppImportExportComponent } from './import-export.component'; diff --git a/demo/src/app/geo/import-export/import-export.component.ts b/demo/src/app/geo/import-export/import-export.component.ts index c5bc361bf7..cc530013ea 100644 --- a/demo/src/app/geo/import-export/import-export.component.ts +++ b/demo/src/app/geo/import-export/import-export.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; +import { WorkspaceStore } from '@igo2/common'; import { LanguageService } from '@igo2/core'; import { IgoMap, LayerService } from '@igo2/geo'; -import { WorkspaceStore } from '@igo2/common'; @Component({ selector: 'app-import-export', diff --git a/demo/src/app/geo/import-export/import-export.module.ts b/demo/src/app/geo/import-export/import-export.module.ts index 73fc7da10f..22d3a4c36e 100644 --- a/demo/src/app/geo/import-export/import-export.module.ts +++ b/demo/src/app/geo/import-export/import-export.module.ts @@ -2,15 +2,15 @@ import { NgModule } from '@angular/core'; import { IgoMessageModule } from '@igo2/core'; import { - IgoMapModule, IgoImportExportModule, - provideStyleListOptions, - IgoStyleModule + IgoMapModule, + IgoStyleModule, + provideStyleListOptions } from '@igo2/geo'; -import { AppImportExportComponent } from './import-export.component'; -import { AppImportExportRoutingModule } from './import-export-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppImportExportRoutingModule } from './import-export-routing.module'; +import { AppImportExportComponent } from './import-export.component'; @NgModule({ declarations: [AppImportExportComponent], diff --git a/demo/src/app/geo/layer/layer-routing.module.ts b/demo/src/app/geo/layer/layer-routing.module.ts index 8e8c1ca811..abad2ba96f 100644 --- a/demo/src/app/geo/layer/layer-routing.module.ts +++ b/demo/src/app/geo/layer/layer-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppLayerComponent } from './layer.component'; diff --git a/demo/src/app/geo/layer/layer.component.ts b/demo/src/app/geo/layer/layer.component.ts index 8039dedabc..92cb86a776 100644 --- a/demo/src/app/geo/layer/layer.component.ts +++ b/demo/src/app/geo/layer/layer.component.ts @@ -2,14 +2,14 @@ import { Component } from '@angular/core'; import { LanguageService } from '@igo2/core'; import { - IgoMap, DataSourceService, - LayerService, - WMSDataSourceOptions, + IgoMap, LayerOptions, - WFSDataSourceOptions, + LayerService, + MetadataLayerOptions, OgcFilterableDataSourceOptions, - MetadataLayerOptions + WFSDataSourceOptions, + WMSDataSourceOptions } from '@igo2/geo'; @Component({ diff --git a/demo/src/app/geo/layer/layer.module.ts b/demo/src/app/geo/layer/layer.module.ts index 7dc193df66..fd32077d63 100644 --- a/demo/src/app/geo/layer/layer.module.ts +++ b/demo/src/app/geo/layer/layer.module.ts @@ -5,16 +5,16 @@ import { MatIconModule } from '@angular/material/icon'; import { IgoPanelModule } from '@igo2/common'; import { - IgoMapModule, - IgoLayerModule, + IgoDownloadModule, IgoFilterModule, - IgoMetadataModule, - IgoDownloadModule + IgoLayerModule, + IgoMapModule, + IgoMetadataModule } from '@igo2/geo'; -import { AppLayerComponent } from './layer.component'; -import { AppLayerRoutingModule } from './layer-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppLayerRoutingModule } from './layer-routing.module'; +import { AppLayerComponent } from './layer.component'; @NgModule({ declarations: [AppLayerComponent], diff --git a/demo/src/app/geo/legend/legend-routing.module.ts b/demo/src/app/geo/legend/legend-routing.module.ts index f4b196eba9..7752301e01 100644 --- a/demo/src/app/geo/legend/legend-routing.module.ts +++ b/demo/src/app/geo/legend/legend-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppLegendComponent } from './legend.component'; diff --git a/demo/src/app/geo/legend/legend.component.ts b/demo/src/app/geo/legend/legend.component.ts index b9019fe959..6a965a0940 100644 --- a/demo/src/app/geo/legend/legend.component.ts +++ b/demo/src/app/geo/legend/legend.component.ts @@ -2,14 +2,14 @@ import { Component } from '@angular/core'; import { LanguageService } from '@igo2/core'; import { - IgoMap, DataSourceService, - LayerService, - WMSDataSourceOptions, + IgoMap, LayerOptions, - WFSDataSourceOptions, + LayerService, + MetadataLayerOptions, OgcFilterableDataSourceOptions, - MetadataLayerOptions + WFSDataSourceOptions, + WMSDataSourceOptions } from '@igo2/geo'; @Component({ diff --git a/demo/src/app/geo/legend/legend.module.ts b/demo/src/app/geo/legend/legend.module.ts index 88fd3aaa26..81e2b93a49 100644 --- a/demo/src/app/geo/legend/legend.module.ts +++ b/demo/src/app/geo/legend/legend.module.ts @@ -5,16 +5,16 @@ import { MatIconModule } from '@angular/material/icon'; import { IgoPanelModule } from '@igo2/common'; import { - IgoMapModule, - IgoLayerModule, + IgoDownloadModule, IgoFilterModule, - IgoMetadataModule, - IgoDownloadModule + IgoLayerModule, + IgoMapModule, + IgoMetadataModule } from '@igo2/geo'; -import { AppLegendComponent } from './legend.component'; -import { AppLegendRoutingModule } from './legend-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppLegendRoutingModule } from './legend-routing.module'; +import { AppLegendComponent } from './legend.component'; @NgModule({ declarations: [AppLegendComponent], diff --git a/demo/src/app/geo/measure/measure-routing.module.ts b/demo/src/app/geo/measure/measure-routing.module.ts index bca5c6e01e..a2c96453a0 100644 --- a/demo/src/app/geo/measure/measure-routing.module.ts +++ b/demo/src/app/geo/measure/measure-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppMeasureComponent } from './measure.component'; diff --git a/demo/src/app/geo/measure/measure.component.ts b/demo/src/app/geo/measure/measure.component.ts index 4f0f2102bc..89ef79434e 100644 --- a/demo/src/app/geo/measure/measure.component.ts +++ b/demo/src/app/geo/measure/measure.component.ts @@ -2,11 +2,11 @@ import { Component } from '@angular/core'; import { LanguageService } from '@igo2/core'; import { - IgoMap, DataSourceService, - LayerService, FeatureStore, - FeatureWithMeasure + FeatureWithMeasure, + IgoMap, + LayerService } from '@igo2/geo'; @Component({ diff --git a/demo/src/app/geo/measure/measure.module.ts b/demo/src/app/geo/measure/measure.module.ts index 96f874bd1a..8a591b6503 100644 --- a/demo/src/app/geo/measure/measure.module.ts +++ b/demo/src/app/geo/measure/measure.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { IgoMapModule, IgoMeasureModule } from '@igo2/geo'; -import { AppMeasureComponent } from './measure.component'; -import { AppMeasureRoutingModule } from './measure-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppMeasureRoutingModule } from './measure-routing.module'; +import { AppMeasureComponent } from './measure.component'; @NgModule({ declarations: [AppMeasureComponent], diff --git a/demo/src/app/geo/ogc-filter/ogc-filter-routing.module.ts b/demo/src/app/geo/ogc-filter/ogc-filter-routing.module.ts index 43a864bae9..7e03b0c805 100644 --- a/demo/src/app/geo/ogc-filter/ogc-filter-routing.module.ts +++ b/demo/src/app/geo/ogc-filter/ogc-filter-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppOgcFilterComponent } from './ogc-filter.component'; diff --git a/demo/src/app/geo/ogc-filter/ogc-filter.component.ts b/demo/src/app/geo/ogc-filter/ogc-filter.component.ts index 3101f53348..8ffeb1d2c6 100644 --- a/demo/src/app/geo/ogc-filter/ogc-filter.component.ts +++ b/demo/src/app/geo/ogc-filter/ogc-filter.component.ts @@ -2,19 +2,19 @@ import { Component } from '@angular/core'; import { LanguageService } from '@igo2/core'; import { - IgoMap, + AnyBaseOgcFilterOptions, DataSourceService, + IgoMap, LayerService, - WMSDataSourceOptions, + OgcFilterDuringOptions, + OgcFilterOperatorType, + OgcFilterableDataSourceOptions, WFSDataSourceOptions, WFSDataSourceOptionsParams, - OgcFilterableDataSourceOptions, - AnyBaseOgcFilterOptions, - OgcFilterOperatorType, - OgcFilterDuringOptions + WMSDataSourceOptions } from '@igo2/geo'; -import { Fill, Stroke, Circle, Style } from 'ol/style'; +import { Circle, Fill, Stroke, Style } from 'ol/style'; @Component({ selector: 'app-ogc-filter', diff --git a/demo/src/app/geo/ogc-filter/ogc-filter.module.ts b/demo/src/app/geo/ogc-filter/ogc-filter.module.ts index 9d1559db05..de7859d6a8 100644 --- a/demo/src/app/geo/ogc-filter/ogc-filter.module.ts +++ b/demo/src/app/geo/ogc-filter/ogc-filter.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; import { IgoPanelModule } from '@igo2/common'; -import { IgoMapModule, IgoFilterModule } from '@igo2/geo'; +import { IgoFilterModule, IgoMapModule } from '@igo2/geo'; -import { AppOgcFilterComponent } from './ogc-filter.component'; -import { AppOgcFilterRoutingModule } from './ogc-filter-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppOgcFilterRoutingModule } from './ogc-filter-routing.module'; +import { AppOgcFilterComponent } from './ogc-filter.component'; @NgModule({ declarations: [AppOgcFilterComponent], diff --git a/demo/src/app/geo/overlay/overlay-routing.module.ts b/demo/src/app/geo/overlay/overlay-routing.module.ts index 86cb15f77f..60fe7bcae9 100644 --- a/demo/src/app/geo/overlay/overlay-routing.module.ts +++ b/demo/src/app/geo/overlay/overlay-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppOverlayComponent } from './overlay.component'; diff --git a/demo/src/app/geo/overlay/overlay.component.ts b/demo/src/app/geo/overlay/overlay.component.ts index 04a2f2303a..fbeedf12ac 100644 --- a/demo/src/app/geo/overlay/overlay.component.ts +++ b/demo/src/app/geo/overlay/overlay.component.ts @@ -1,13 +1,13 @@ -import { Component, OnInit, AfterViewInit } from '@angular/core'; +import { AfterViewInit, Component, OnInit } from '@angular/core'; import { LanguageService } from '@igo2/core'; import { - IgoMap, DataSourceService, - LayerService, FEATURE, Feature, - FeatureMotion + FeatureMotion, + IgoMap, + LayerService } from '@igo2/geo'; @Component({ diff --git a/demo/src/app/geo/overlay/overlay.module.ts b/demo/src/app/geo/overlay/overlay.module.ts index bd8a422a0d..f1561b6186 100644 --- a/demo/src/app/geo/overlay/overlay.module.ts +++ b/demo/src/app/geo/overlay/overlay.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { IgoMapModule, IgoOverlayModule } from '@igo2/geo'; -import { AppOverlayComponent } from './overlay.component'; -import { AppOverlayRoutingModule } from './overlay-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppOverlayRoutingModule } from './overlay-routing.module'; +import { AppOverlayComponent } from './overlay.component'; @NgModule({ declarations: [AppOverlayComponent], diff --git a/demo/src/app/geo/print/print-routing.module.ts b/demo/src/app/geo/print/print-routing.module.ts index 5a15e16ad3..5b4e3765ea 100644 --- a/demo/src/app/geo/print/print-routing.module.ts +++ b/demo/src/app/geo/print/print-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppPrintComponent } from './print.component'; diff --git a/demo/src/app/geo/print/print.module.ts b/demo/src/app/geo/print/print.module.ts index de5a25c6d6..c740894f8e 100644 --- a/demo/src/app/geo/print/print.module.ts +++ b/demo/src/app/geo/print/print.module.ts @@ -3,9 +3,9 @@ import { NgModule } from '@angular/core'; import { IgoMessageModule } from '@igo2/core'; import { IgoMapModule, IgoPrintModule } from '@igo2/geo'; -import { AppPrintComponent } from './print.component'; -import { AppPrintRoutingModule } from './print-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppPrintRoutingModule } from './print-routing.module'; +import { AppPrintComponent } from './print.component'; @NgModule({ declarations: [AppPrintComponent], diff --git a/demo/src/app/geo/query/query-routing.module.ts b/demo/src/app/geo/query/query-routing.module.ts index 0f58357c4f..4d4495d6fc 100644 --- a/demo/src/app/geo/query/query-routing.module.ts +++ b/demo/src/app/geo/query/query-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppQueryComponent } from './query.component'; diff --git a/demo/src/app/geo/query/query.component.ts b/demo/src/app/geo/query/query.component.ts index 069fa394ab..1ee143bfc9 100644 --- a/demo/src/app/geo/query/query.component.ts +++ b/demo/src/app/geo/query/query.component.ts @@ -1,27 +1,26 @@ import { Component } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; - -import olFeature from 'ol/Feature'; -import olPoint from 'ol/geom/Point'; -import olPolygon from 'ol/geom/Polygon'; -import olLineString from 'ol/geom/LineString'; -import * as olproj from 'ol/proj'; - +import { getEntityTitle } from '@igo2/common'; import { - IgoMap, - FeatureDataSource, DataSourceService, - LayerService, Feature, - QueryableDataSourceOptions, + FeatureDataSource, + FeatureMotion, + IgoMap, + LayerService, QueryFormat, QueryHtmlTarget, - SearchResult, - FeatureMotion + QueryableDataSourceOptions, + SearchResult } from '@igo2/geo'; -import { getEntityTitle } from '@igo2/common'; +import olFeature from 'ol/Feature'; +import olLineString from 'ol/geom/LineString'; +import olPoint from 'ol/geom/Point'; +import olPolygon from 'ol/geom/Polygon'; +import * as olproj from 'ol/proj'; + +import { BehaviorSubject } from 'rxjs'; @Component({ selector: 'app-query', diff --git a/demo/src/app/geo/query/query.module.ts b/demo/src/app/geo/query/query.module.ts index a343bf7ca6..5462fda2a1 100644 --- a/demo/src/app/geo/query/query.module.ts +++ b/demo/src/app/geo/query/query.module.ts @@ -2,15 +2,15 @@ import { NgModule } from '@angular/core'; import { IgoPanelModule } from '@igo2/common'; import { + IgoFeatureModule, IgoMapModule, IgoOverlayModule, - IgoQueryModule, - IgoFeatureModule + IgoQueryModule } from '@igo2/geo'; -import { AppQueryComponent } from './query.component'; -import { AppQueryRoutingModule } from './query-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppQueryRoutingModule } from './query-routing.module'; +import { AppQueryComponent } from './query.component'; @NgModule({ declarations: [AppQueryComponent], diff --git a/demo/src/app/geo/search/search-routing.module.ts b/demo/src/app/geo/search/search-routing.module.ts index f492f57e3b..a3fbc822e7 100644 --- a/demo/src/app/geo/search/search-routing.module.ts +++ b/demo/src/app/geo/search/search-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppSearchComponent } from './search.component'; diff --git a/demo/src/app/geo/search/search.component.ts b/demo/src/app/geo/search/search.component.ts index a2519295e8..6ca1ac9a8e 100644 --- a/demo/src/app/geo/search/search.component.ts +++ b/demo/src/app/geo/search/search.component.ts @@ -1,4 +1,3 @@ -import { BehaviorSubject } from 'rxjs'; import { Component, ElementRef, @@ -6,26 +5,28 @@ import { OnInit, ViewChild } from '@angular/core'; -import * as proj from 'ol/proj'; +import { ActionStore, EntityStore } from '@igo2/common'; import { LanguageService, MediaService, StorageService } from '@igo2/core'; -import { EntityStore, ActionStore } from '@igo2/common'; import { FEATURE, Feature, FeatureMotion, GoogleLinks, IgoMap, + Layer, LayerService, MapService, - Layer, ProjectionService, Research, SearchResult } from '@igo2/geo'; - import { SearchState } from '@igo2/integration'; +import * as proj from 'ol/proj'; + +import { BehaviorSubject } from 'rxjs'; + @Component({ selector: 'app-search', templateUrl: './search.component.html', diff --git a/demo/src/app/geo/search/search.module.ts b/demo/src/app/geo/search/search.module.ts index 0b6fc48656..13e019f71c 100644 --- a/demo/src/app/geo/search/search.module.ts +++ b/demo/src/app/geo/search/search.module.ts @@ -1,33 +1,30 @@ import { NgModule } from '@angular/core'; -import { IgoMessageModule } from '@igo2/core'; - import { - IgoPanelModule, IgoActionbarModule, - IgoContextMenuModule + IgoContextMenuModule, + IgoPanelModule } from '@igo2/common'; - +import { IgoMessageModule } from '@igo2/core'; import { IgoFeatureModule, IgoMapModule, IgoSearchModule, + provideCadastreSearchSource, + provideCoordinatesReverseSearchSource, + provideIChercheReverseSearchSource, provideIChercheSearchSource, - provideWorkspaceSearchSource, provideILayerSearchSource, provideNominatimSearchSource, - provideIChercheReverseSearchSource, - provideCoordinatesReverseSearchSource, - provideCadastreSearchSource, + provideStoredQueriesReverseSearchSource, provideStoredQueriesSearchSource, - provideStoredQueriesReverseSearchSource + provideWorkspaceSearchSource } from '@igo2/geo'; - import { IgoAppSearchModule } from '@igo2/integration'; -import { AppSearchComponent } from './search.component'; -import { AppSearchRoutingModule } from './search-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppSearchRoutingModule } from './search-routing.module'; +import { AppSearchComponent } from './search.component'; @NgModule({ declarations: [AppSearchComponent], diff --git a/demo/src/app/geo/simple-map/simple-map-routing.module.ts b/demo/src/app/geo/simple-map/simple-map-routing.module.ts index 38085042ee..4165a7a88b 100644 --- a/demo/src/app/geo/simple-map/simple-map-routing.module.ts +++ b/demo/src/app/geo/simple-map/simple-map-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppSimpleMapComponent } from './simple-map.component'; diff --git a/demo/src/app/geo/simple-map/simple-map.component.ts b/demo/src/app/geo/simple-map/simple-map.component.ts index 5796dcec65..464c5f7308 100644 --- a/demo/src/app/geo/simple-map/simple-map.component.ts +++ b/demo/src/app/geo/simple-map/simple-map.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { LanguageService, MediaService } from '@igo2/core'; -import { IgoMap, DataSourceService, LayerService } from '@igo2/geo'; +import { DataSourceService, IgoMap, LayerService } from '@igo2/geo'; @Component({ selector: 'app-simple-map', diff --git a/demo/src/app/geo/simple-map/simple-map.module.ts b/demo/src/app/geo/simple-map/simple-map.module.ts index d37e50a8d3..510fbdbf1c 100644 --- a/demo/src/app/geo/simple-map/simple-map.module.ts +++ b/demo/src/app/geo/simple-map/simple-map.module.ts @@ -4,9 +4,9 @@ import { MatCardModule } from '@angular/material/card'; import { IgoMapModule } from '@igo2/geo'; -import { AppSimpleMapComponent } from './simple-map.component'; -import { AppSimpleMapRoutingModule } from './simple-map-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppSimpleMapRoutingModule } from './simple-map-routing.module'; +import { AppSimpleMapComponent } from './simple-map.component'; @NgModule({ declarations: [AppSimpleMapComponent], diff --git a/demo/src/app/geo/spatial-filter/spatial-filter-routing.module.ts b/demo/src/app/geo/spatial-filter/spatial-filter-routing.module.ts index f792a857fb..b8ab3fcb12 100644 --- a/demo/src/app/geo/spatial-filter/spatial-filter-routing.module.ts +++ b/demo/src/app/geo/spatial-filter/spatial-filter-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppSpatialFilterComponent } from './spatial-filter.component'; diff --git a/demo/src/app/geo/spatial-filter/spatial-filter.component.ts b/demo/src/app/geo/spatial-filter/spatial-filter.component.ts index 12b5693e4a..666694e6f5 100644 --- a/demo/src/app/geo/spatial-filter/spatial-filter.component.ts +++ b/demo/src/app/geo/spatial-filter/spatial-filter.component.ts @@ -1,44 +1,46 @@ import { - Component, - Input, ChangeDetectionStrategy, ChangeDetectorRef, + Component, + Input, OnDestroy, OnInit } from '@angular/core'; import { MatIconRegistry } from '@angular/material/icon'; -import { Observable, forkJoin, Subject } from 'rxjs'; -import { tap, take, takeUntil } from 'rxjs/operators'; +import { EntityStore, EntityStoreWithStrategy } from '@igo2/common'; +import { LanguageService, MessageService } from '@igo2/core'; import { - IgoMap, + ClusterDataSource, + DataSource, DataSourceService, - LayerService, Feature, - moveToOlFeatures, FeatureMotion, - ClusterDataSource, - featureToOl, - DataSource, + IgoMap, + Layer, + LayerService, + MeasureLengthUnit, QueryableDataSourceOptions, - SpatialFilterService, - SpatialFilterType, SpatialFilterItemType, SpatialFilterQueryType, + SpatialFilterService, SpatialFilterThematic, - Layer, + SpatialFilterType, VectorLayer, createOverlayMarkerStyle, - MeasureLengthUnit + featureToOl, + moveToOlFeatures } from '@igo2/geo'; -import { EntityStore, EntityStoreWithStrategy } from '@igo2/common'; + import olFormatGeoJSON from 'ol/format/GeoJSON'; -import olSourceVector from 'ol/source/Vector'; -import olSourceCluster from 'ol/source/Cluster'; import type { default as OlGeometry } from 'ol/geom/Geometry'; -import { BehaviorSubject } from 'rxjs'; +import olSourceCluster from 'ol/source/Cluster'; +import olSourceVector from 'ol/source/Vector'; import * as olstyle from 'ol/style'; -import { MessageService, LanguageService } from '@igo2/core'; + +import { Observable, Subject, forkJoin } from 'rxjs'; +import { BehaviorSubject } from 'rxjs'; +import { take, takeUntil, tap } from 'rxjs/operators'; /** * Spatial Filter Type diff --git a/demo/src/app/geo/spatial-filter/spatial-filter.module.ts b/demo/src/app/geo/spatial-filter/spatial-filter.module.ts index 417e427b0a..c39956bd94 100644 --- a/demo/src/app/geo/spatial-filter/spatial-filter.module.ts +++ b/demo/src/app/geo/spatial-filter/spatial-filter.module.ts @@ -1,18 +1,18 @@ import { NgModule } from '@angular/core'; -import { IgoPanelModule, IgoFormModule } from '@igo2/common'; +import { IgoFormModule, IgoPanelModule } from '@igo2/common'; +import { IgoMessageModule } from '@igo2/core'; import { - IgoMapModule, - IgoFilterModule, - IgoQueryModule, + IgoFeatureDetailsModule, IgoFeatureModule, - IgoFeatureDetailsModule + IgoFilterModule, + IgoMapModule, + IgoQueryModule } from '@igo2/geo'; -import { IgoMessageModule } from '@igo2/core'; -import { AppSpatialFilterComponent } from './spatial-filter.component'; -import { AppSpatialFilterRoutingModule } from './spatial-filter-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppSpatialFilterRoutingModule } from './spatial-filter-routing.module'; +import { AppSpatialFilterComponent } from './spatial-filter.component'; @NgModule({ declarations: [AppSpatialFilterComponent], diff --git a/demo/src/app/geo/time-filter/time-filter-routing.module.ts b/demo/src/app/geo/time-filter/time-filter-routing.module.ts index ec42146515..556df96c36 100644 --- a/demo/src/app/geo/time-filter/time-filter-routing.module.ts +++ b/demo/src/app/geo/time-filter/time-filter-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppTimeFilterComponent } from './time-filter.component'; diff --git a/demo/src/app/geo/time-filter/time-filter.component.ts b/demo/src/app/geo/time-filter/time-filter.component.ts index 6848b39757..8a8c4ee8f2 100644 --- a/demo/src/app/geo/time-filter/time-filter.component.ts +++ b/demo/src/app/geo/time-filter/time-filter.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { LanguageService } from '@igo2/core'; import { - IgoMap, DataSourceService, + IgoMap, LayerService, - TimeFilterableDataSourceOptions, + TimeFilterStyle, TimeFilterType, - TimeFilterStyle + TimeFilterableDataSourceOptions } from '@igo2/geo'; @Component({ diff --git a/demo/src/app/geo/time-filter/time-filter.module.ts b/demo/src/app/geo/time-filter/time-filter.module.ts index eedc0c8b29..fef4fbd540 100644 --- a/demo/src/app/geo/time-filter/time-filter.module.ts +++ b/demo/src/app/geo/time-filter/time-filter.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; import { IgoPanelModule } from '@igo2/common'; -import { IgoMapModule, IgoFilterModule } from '@igo2/geo'; +import { IgoFilterModule, IgoMapModule } from '@igo2/geo'; -import { AppTimeFilterComponent } from './time-filter.component'; -import { AppTimeFilterRoutingModule } from './time-filter-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppTimeFilterRoutingModule } from './time-filter-routing.module'; +import { AppTimeFilterComponent } from './time-filter.component'; @NgModule({ declarations: [AppTimeFilterComponent], diff --git a/demo/src/app/geo/workspace/workspace-routing.module.ts b/demo/src/app/geo/workspace/workspace-routing.module.ts index 211a819937..d93f823f9c 100644 --- a/demo/src/app/geo/workspace/workspace-routing.module.ts +++ b/demo/src/app/geo/workspace/workspace-routing.module.ts @@ -1,4 +1,4 @@ -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AppWorkspaceComponent } from './workspace.component'; diff --git a/demo/src/app/geo/workspace/workspace.component.ts b/demo/src/app/geo/workspace/workspace.component.ts index 0cdebc2f80..3d1418e60c 100644 --- a/demo/src/app/geo/workspace/workspace.component.ts +++ b/demo/src/app/geo/workspace/workspace.component.ts @@ -1,26 +1,26 @@ import { Component, OnInit } from '@angular/core'; +import { MatPaginator } from '@angular/material/paginator'; -import { Observable, BehaviorSubject } from 'rxjs'; -import { map } from 'rxjs/operators'; - -import { LanguageService } from '@igo2/core'; import { ActionbarMode, EntityRecord, + EntityTablePaginatorOptions, EntityTableScrollBehavior, Workspace, - WorkspaceStore, - EntityTablePaginatorOptions + WorkspaceStore } from '@igo2/common'; +import { LanguageService } from '@igo2/core'; import { - IgoMap, DataSourceService, + IgoMap, LayerService, WFSDataSourceOptions } from '@igo2/geo'; -import { MatPaginator } from '@angular/material/paginator'; import { WorkspaceState } from '@igo2/integration'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; + @Component({ selector: 'app-workspace', templateUrl: './workspace.component.html', diff --git a/demo/src/app/geo/workspace/workspace.module.ts b/demo/src/app/geo/workspace/workspace.module.ts index a2b7d2a478..8993e04263 100644 --- a/demo/src/app/geo/workspace/workspace.module.ts +++ b/demo/src/app/geo/workspace/workspace.module.ts @@ -3,14 +3,14 @@ import { NgModule } from '@angular/core'; import { IgoActionModule, IgoEntityModule, - IgoWorkspaceModule, - IgoPanelModule + IgoPanelModule, + IgoWorkspaceModule } from '@igo2/common'; -import { IgoMapModule, IgoGeoWorkspaceModule } from '@igo2/geo'; +import { IgoGeoWorkspaceModule, IgoMapModule } from '@igo2/geo'; -import { AppWorkspaceComponent } from './workspace.component'; -import { AppWorkspaceRoutingModule } from './workspace-routing.module'; import { SharedModule } from '../../shared/shared.module'; +import { AppWorkspaceRoutingModule } from './workspace-routing.module'; +import { AppWorkspaceComponent } from './workspace.component'; @NgModule({ declarations: [AppWorkspaceComponent], diff --git a/demo/src/app/shared/shared.module.ts b/demo/src/app/shared/shared.module.ts index 90e98ce452..4b7cd60187 100644 --- a/demo/src/app/shared/shared.module.ts +++ b/demo/src/app/shared/shared.module.ts @@ -1,14 +1,15 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ExampleModule } from '../components/example/example.module'; -import { DocViewerModule } from '../components/doc-viewer/doc-viewer.module'; -import { MatCardModule } from '@angular/material/card'; +import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { DocViewerModule } from '../components/doc-viewer/doc-viewer.module'; +import { ExampleModule } from '../components/example/example.module'; + @NgModule({ declarations: [], exports: [ diff --git a/demo/src/main.ts b/demo/src/main.ts index 667dc866cf..0fa4f834be 100644 --- a/demo/src/main.ts +++ b/demo/src/main.ts @@ -1,11 +1,11 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; +import 'hammerjs'; + import { AppModule } from './app/app.module'; import { environment } from './environments/environment'; -import 'hammerjs'; - if (environment.production) { enableProdMode(); } diff --git a/packages/auth/src/lib/auth-form/auth-facebook.component.ts b/packages/auth/src/lib/auth-form/auth-facebook.component.ts index 2ea07a8532..22e4602c02 100644 --- a/packages/auth/src/lib/auth-form/auth-facebook.component.ts +++ b/packages/auth/src/lib/auth-form/auth-facebook.component.ts @@ -1,12 +1,13 @@ import { - Component, - ChangeDetectionStrategy, ApplicationRef, - Output, - EventEmitter + ChangeDetectionStrategy, + Component, + EventEmitter, + Output } from '@angular/core'; import { ConfigService } from '@igo2/core'; + import { AuthFacebookOptions } from '../shared/auth.interface'; import { AuthService } from '../shared/auth.service'; diff --git a/packages/auth/src/lib/auth-form/auth-form.component.ts b/packages/auth/src/lib/auth-form/auth-form.component.ts index c39546fb47..6012c0106f 100644 --- a/packages/auth/src/lib/auth-form/auth-form.component.ts +++ b/packages/auth/src/lib/auth-form/auth-form.component.ts @@ -1,16 +1,18 @@ import { - Component, ChangeDetectionStrategy, - OnInit, + Component, + EventEmitter, Input, + OnInit, Optional, - Output, - EventEmitter + Output } from '@angular/core'; -import { Router, NavigationStart } from '@angular/router'; -import { filter } from 'rxjs/operators'; +import { NavigationStart, Router } from '@angular/router'; import { ConfigService } from '@igo2/core'; + +import { filter } from 'rxjs/operators'; + import { AuthOptions } from '../shared/auth.interface'; import { AuthService } from '../shared/auth.service'; diff --git a/packages/auth/src/lib/auth-form/auth-google.component.ts b/packages/auth/src/lib/auth-form/auth-google.component.ts index 31ffdf65b9..b3d62bf8a3 100644 --- a/packages/auth/src/lib/auth-form/auth-google.component.ts +++ b/packages/auth/src/lib/auth-form/auth-google.component.ts @@ -1,12 +1,13 @@ import { - Component, - ChangeDetectionStrategy, ApplicationRef, - Output, - EventEmitter + ChangeDetectionStrategy, + Component, + EventEmitter, + Output } from '@angular/core'; import { ConfigService, LanguageService } from '@igo2/core'; + import { AuthGoogleOptions } from '../shared/auth.interface'; import { AuthService } from '../shared/auth.service'; diff --git a/packages/auth/src/lib/auth-form/auth-intern.component.ts b/packages/auth/src/lib/auth-form/auth-intern.component.ts index 8a8d65350d..52e291d321 100644 --- a/packages/auth/src/lib/auth-form/auth-intern.component.ts +++ b/packages/auth/src/lib/auth-form/auth-intern.component.ts @@ -1,19 +1,20 @@ import { - Component, ChangeDetectionStrategy, + Component, + EventEmitter, Input, - Output, - EventEmitter + Output } from '@angular/core'; import { - Validators, + UntypedFormBuilder, UntypedFormGroup, - UntypedFormBuilder + Validators } from '@angular/forms'; -import { AuthService } from '../shared/auth.service'; import { LanguageService } from '@igo2/core'; +import { AuthService } from '../shared/auth.service'; + @Component({ selector: 'igo-auth-intern', templateUrl: './auth-intern.component.html', diff --git a/packages/auth/src/lib/auth-form/auth-microsoft.component.ts b/packages/auth/src/lib/auth-form/auth-microsoft.component.ts index 2f589ed31b..71095d7aba 100644 --- a/packages/auth/src/lib/auth-form/auth-microsoft.component.ts +++ b/packages/auth/src/lib/auth-form/auth-microsoft.component.ts @@ -1,32 +1,35 @@ import { - Component, - ChangeDetectionStrategy, ApplicationRef, - Output, + ChangeDetectionStrategy, + Component, EventEmitter, - Inject + Inject, + Output } from '@angular/core'; + +import { ConfigService } from '@igo2/core'; + import { + MSAL_GUARD_CONFIG, MsalBroadcastService, - MsalService, - MSAL_GUARD_CONFIG + MsalService } from '@azure/msal-angular'; import { - InteractionStatus, AuthenticationResult, - PublicClientApplication, + InteractionRequiredAuthError, + InteractionStatus, PopupRequest, - SilentRequest, - InteractionRequiredAuthError + PublicClientApplication, + SilentRequest } from '@azure/msal-browser'; -import { ConfigService } from '@igo2/core'; +import { Subject } from 'rxjs'; +import { filter, takeUntil } from 'rxjs/operators'; + import { AuthMicrosoftOptions, MSPMsalGuardConfiguration } from '../shared/auth.interface'; import { AuthService } from '../shared/auth.service'; -import { filter, takeUntil } from 'rxjs/operators'; -import { Subject } from 'rxjs'; @Component({ selector: 'igo-auth-microsoft', diff --git a/packages/auth/src/lib/auth-form/auth-microsoftb2c.component.ts b/packages/auth/src/lib/auth-form/auth-microsoftb2c.component.ts index 811a3fef02..8c14c42666 100644 --- a/packages/auth/src/lib/auth-form/auth-microsoftb2c.component.ts +++ b/packages/auth/src/lib/auth-form/auth-microsoftb2c.component.ts @@ -1,31 +1,33 @@ import { - Component, - ChangeDetectionStrategy, ApplicationRef, - Output, + ChangeDetectionStrategy, + Component, EventEmitter, - Inject + Inject, + Output } from '@angular/core'; +import { ConfigService } from '@igo2/core'; + import { MSAL_GUARD_CONFIG } from '@azure/msal-angular'; import { - InteractionStatus, AuthenticationResult, - PublicClientApplication, + InteractionRequiredAuthError, + InteractionStatus, PopupRequest, - SilentRequest, - InteractionRequiredAuthError + PublicClientApplication, + SilentRequest } from '@azure/msal-browser'; -import { ConfigService } from '@igo2/core'; +import { Subject } from 'rxjs'; +import { filter, takeUntil } from 'rxjs/operators'; + +import { MsalBroadcastServiceb2c } from '../shared/auth-msalBroadcastServiceb2c.service'; +import { MsalServiceb2c } from '../shared/auth-msalServiceb2c.service.'; import { AuthMicrosoftb2cOptions, MSPMsalGuardConfiguration } from '../shared/auth.interface'; import { AuthService } from '../shared/auth.service'; -import { filter, takeUntil } from 'rxjs/operators'; -import { Subject } from 'rxjs'; -import { MsalBroadcastServiceb2c } from '../shared/auth-msalBroadcastServiceb2c.service'; -import { MsalServiceb2c } from '../shared/auth-msalServiceb2c.service.'; @Component({ selector: 'igo-auth-microsoftb2c', diff --git a/packages/auth/src/lib/auth-routing.module.ts b/packages/auth/src/lib/auth-routing.module.ts index 24e0bb9477..be32aaaf64 100644 --- a/packages/auth/src/lib/auth-routing.module.ts +++ b/packages/auth/src/lib/auth-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AuthFormComponent } from './auth-form/auth-form.component'; diff --git a/packages/auth/src/lib/auth.module.ts b/packages/auth/src/lib/auth.module.ts index dbfb315a26..2aeeaf53fc 100644 --- a/packages/auth/src/lib/auth.module.ts +++ b/packages/auth/src/lib/auth.module.ts @@ -1,26 +1,26 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; -import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MsalModule } from '@azure/msal-angular'; -import { StorageService, IgoLanguageModule } from '@igo2/core'; +import { IgoLanguageModule, StorageService } from '@igo2/core'; -import { AuthStorageService } from './shared/storage.service'; -import { ProtectedDirective } from './shared/protected.directive'; -import { AuthInterceptor } from './shared/auth.interceptor'; -import { provideAuthMicrosoft } from './shared/auth-microsoft.provider'; +import { MsalModule } from '@azure/msal-angular'; -import { AuthInternComponent } from './auth-form/auth-intern.component'; +import { AuthFacebookComponent } from './auth-form/auth-facebook.component'; import { AuthFormComponent } from './auth-form/auth-form.component'; import { AuthGoogleComponent } from './auth-form/auth-google.component'; -import { AuthFacebookComponent } from './auth-form/auth-facebook.component'; +import { AuthInternComponent } from './auth-form/auth-intern.component'; import { AuthMicrosoftComponent } from './auth-form/auth-microsoft.component'; import { AuthMicrosoftb2cComponent } from './auth-form/auth-microsoftb2c.component'; +import { provideAuthMicrosoft } from './shared/auth-microsoft.provider'; +import { AuthInterceptor } from './shared/auth.interceptor'; +import { ProtectedDirective } from './shared/protected.directive'; +import { AuthStorageService } from './shared/storage.service'; @NgModule({ imports: [ diff --git a/packages/auth/src/lib/shared/admin.guard.ts b/packages/auth/src/lib/shared/admin.guard.ts index 72b01079ba..1ddf47d71a 100644 --- a/packages/auth/src/lib/shared/admin.guard.ts +++ b/packages/auth/src/lib/shared/admin.guard.ts @@ -1,11 +1,12 @@ import { Injectable } from '@angular/core'; import { - Router, ActivatedRouteSnapshot, + Router, RouterStateSnapshot } from '@angular/router'; import { ConfigService } from '@igo2/core'; + import { AuthService } from './auth.service'; @Injectable({ diff --git a/packages/auth/src/lib/shared/auth-microsoft.provider.ts b/packages/auth/src/lib/shared/auth-microsoft.provider.ts index a9e5326be0..4f4ca60fa7 100644 --- a/packages/auth/src/lib/shared/auth-microsoft.provider.ts +++ b/packages/auth/src/lib/shared/auth-microsoft.provider.ts @@ -1,22 +1,19 @@ +import { ConfigService } from '@igo2/core'; + import { MSAL_GUARD_CONFIG, MSAL_INSTANCE, MsalService } from '@azure/msal-angular'; - -import { PublicClientApplication, InteractionType } from '@azure/msal-browser'; - -import { ConfigService } from '@igo2/core'; - +import { InteractionType, PublicClientApplication } from '@azure/msal-browser'; import { BrowserAuthOptions } from '@azure/msal-browser'; +import { MsalServiceb2c } from './auth-msalServiceb2c.service.'; import { AuthMicrosoftOptions, MSPMsalGuardConfiguration } from './auth.interface'; -import { MsalServiceb2c } from './auth-msalServiceb2c.service.'; - export function MSALConfigFactory( config: ConfigService ): PublicClientApplication { diff --git a/packages/auth/src/lib/shared/auth-msalBroadcastServiceb2c.service.ts b/packages/auth/src/lib/shared/auth-msalBroadcastServiceb2c.service.ts index 7a5d49d4a1..7cfdf60f95 100644 --- a/packages/auth/src/lib/shared/auth-msalBroadcastServiceb2c.service.ts +++ b/packages/auth/src/lib/shared/auth-msalBroadcastServiceb2c.service.ts @@ -2,9 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ - import { Inject, Injectable } from '@angular/core'; -import { BehaviorSubject, Observable, Subject } from 'rxjs'; + import { MSAL_INSTANCE } from '@azure/msal-angular'; import { EventMessage, @@ -12,6 +11,8 @@ import { IPublicClientApplication, InteractionStatus } from '@azure/msal-browser'; +import { BehaviorSubject, Observable, Subject } from 'rxjs'; + import { MsalServiceb2c } from './auth-msalServiceb2c.service.'; @Injectable() diff --git a/packages/auth/src/lib/shared/auth-msalServiceb2c.service..ts b/packages/auth/src/lib/shared/auth-msalServiceb2c.service..ts index 366a042e65..7a82b5d289 100644 --- a/packages/auth/src/lib/shared/auth-msalServiceb2c.service..ts +++ b/packages/auth/src/lib/shared/auth-msalServiceb2c.service..ts @@ -2,24 +2,24 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ - -import { Inject, Injectable } from '@angular/core'; import { Location } from '@angular/common'; +import { Inject, Injectable } from '@angular/core'; + +import { MSAL_INSTANCE } from '@azure/msal-angular'; +import { IMsalService } from '@azure/msal-angular'; import { - IPublicClientApplication, - EndSessionRequest, - EndSessionPopupRequest, AuthenticationResult, + EndSessionPopupRequest, + EndSessionRequest, + IPublicClientApplication, + Logger, + PopupRequest, RedirectRequest, SilentRequest, - PopupRequest, SsoSilentRequest, - Logger, WrapperSKU } from '@azure/msal-browser'; -import { MSAL_INSTANCE } from '@azure/msal-angular'; import { Observable, from } from 'rxjs'; -import { IMsalService } from '@azure/msal-angular'; @Injectable() export class MsalServiceb2c implements IMsalService { diff --git a/packages/auth/src/lib/shared/auth.guard.ts b/packages/auth/src/lib/shared/auth.guard.ts index cdc0d41ece..f6b6dde3cc 100644 --- a/packages/auth/src/lib/shared/auth.guard.ts +++ b/packages/auth/src/lib/shared/auth.guard.ts @@ -1,11 +1,12 @@ import { Injectable } from '@angular/core'; import { - Router, ActivatedRouteSnapshot, + Router, RouterStateSnapshot } from '@angular/router'; import { ConfigService } from '@igo2/core'; + import { AuthService } from './auth.service'; @Injectable({ diff --git a/packages/auth/src/lib/shared/auth.interceptor.ts b/packages/auth/src/lib/shared/auth.interceptor.ts index 802b9f8ed0..d653eb4890 100644 --- a/packages/auth/src/lib/shared/auth.interceptor.ts +++ b/packages/auth/src/lib/shared/auth.interceptor.ts @@ -1,17 +1,19 @@ -import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { HttpEvent, - HttpInterceptor, HttpHandler, + HttpInterceptor, HttpRequest } from '@angular/common/http'; +import { Injectable } from '@angular/core'; + +import { ConfigService } from '@igo2/core'; + import { Observable } from 'rxjs'; import { Md5 } from 'ts-md5'; -import { ConfigService } from '@igo2/core'; -import { TokenService } from './token.service'; import { AuthByKeyOptions, WithCredentialsOptions } from './auth.interface'; +import { TokenService } from './token.service'; @Injectable({ providedIn: 'root' diff --git a/packages/auth/src/lib/shared/auth.interface.ts b/packages/auth/src/lib/shared/auth.interface.ts index 17ac6490d3..fbc329a332 100644 --- a/packages/auth/src/lib/shared/auth.interface.ts +++ b/packages/auth/src/lib/shared/auth.interface.ts @@ -1,5 +1,5 @@ -import { BrowserAuthOptions } from '@azure/msal-browser'; import { MsalGuardConfiguration } from '@azure/msal-angular'; +import { BrowserAuthOptions } from '@azure/msal-browser'; export interface AuthInternOptions { enabled?: boolean; diff --git a/packages/auth/src/lib/shared/auth.service.spec.ts b/packages/auth/src/lib/shared/auth.service.spec.ts index 3f4e985db2..983308c09e 100644 --- a/packages/auth/src/lib/shared/auth.service.spec.ts +++ b/packages/auth/src/lib/shared/auth.service.spec.ts @@ -1,5 +1,5 @@ -import { TestBed, inject } from '@angular/core/testing'; import { HttpClientModule } from '@angular/common/http'; +import { TestBed, inject } from '@angular/core/testing'; import { IgoLanguageModule, IgoMessageModule } from '@igo2/core'; diff --git a/packages/auth/src/lib/shared/auth.service.ts b/packages/auth/src/lib/shared/auth.service.ts index 4d04ba0b66..e2243f6897 100644 --- a/packages/auth/src/lib/shared/auth.service.ts +++ b/packages/auth/src/lib/shared/auth.service.ts @@ -1,15 +1,15 @@ -import { Injectable, Optional } from '@angular/core'; import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { Injectable, Optional } from '@angular/core'; import { Router } from '@angular/router'; -import { Observable, BehaviorSubject, of } from 'rxjs'; -import { tap, catchError } from 'rxjs/operators'; -import { globalCacheBusterNotifier } from 'ts-cacheable'; - import { ConfigService, LanguageService, MessageService } from '@igo2/core'; import { Base64 } from '@igo2/utils'; -import { User, IInfosUser } from './auth.interface'; +import { BehaviorSubject, Observable, of } from 'rxjs'; +import { catchError, tap } from 'rxjs/operators'; +import { globalCacheBusterNotifier } from 'ts-cacheable'; + +import { IInfosUser, User } from './auth.interface'; import { TokenService } from './token.service'; @Injectable({ diff --git a/packages/auth/src/lib/shared/logged.guard.ts b/packages/auth/src/lib/shared/logged.guard.ts index a6b67a67bb..541375e778 100644 --- a/packages/auth/src/lib/shared/logged.guard.ts +++ b/packages/auth/src/lib/shared/logged.guard.ts @@ -1,11 +1,12 @@ import { Injectable } from '@angular/core'; import { - Router, ActivatedRouteSnapshot, + Router, RouterStateSnapshot } from '@angular/router'; import { ConfigService } from '@igo2/core'; + import { AuthService } from './auth.service'; @Injectable({ diff --git a/packages/auth/src/lib/shared/profils.guard.ts b/packages/auth/src/lib/shared/profils.guard.ts index 31d1d7d55a..063e9ad46a 100644 --- a/packages/auth/src/lib/shared/profils.guard.ts +++ b/packages/auth/src/lib/shared/profils.guard.ts @@ -1,12 +1,14 @@ import { Injectable } from '@angular/core'; import { - Router, ActivatedRouteSnapshot, + Router, RouterStateSnapshot } from '@angular/router'; -import { map } from 'rxjs/operators'; import { ConfigService } from '@igo2/core'; + +import { map } from 'rxjs/operators'; + import { AuthService } from './auth.service'; @Injectable({ diff --git a/packages/auth/src/lib/shared/protected.directive.ts b/packages/auth/src/lib/shared/protected.directive.ts index 091790e328..79cdbf09b8 100644 --- a/packages/auth/src/lib/shared/protected.directive.ts +++ b/packages/auth/src/lib/shared/protected.directive.ts @@ -1,4 +1,5 @@ import { Directive, ElementRef } from '@angular/core'; + import { AuthService } from './auth.service'; @Directive({ diff --git a/packages/auth/src/lib/shared/storage.service.ts b/packages/auth/src/lib/shared/storage.service.ts index 9ba12819e1..dacf2df734 100644 --- a/packages/auth/src/lib/shared/storage.service.ts +++ b/packages/auth/src/lib/shared/storage.service.ts @@ -1,10 +1,11 @@ -import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; + +import { BaseStorage, ConfigService, StorageScope } from '@igo2/core'; -import { StorageScope, ConfigService, BaseStorage } from '@igo2/core'; import { AuthService } from './auth.service'; -import { TokenService } from './token.service'; import { AuthStorageOptions } from './storage.interface'; +import { TokenService } from './token.service'; @Injectable({ providedIn: 'root' diff --git a/packages/auth/src/lib/shared/token.service.ts b/packages/auth/src/lib/shared/token.service.ts index 15b2590232..6b0c49fea3 100644 --- a/packages/auth/src/lib/shared/token.service.ts +++ b/packages/auth/src/lib/shared/token.service.ts @@ -1,7 +1,9 @@ import { Injectable, Injector } from '@angular/core'; -import jwtDecode from 'jwt-decode'; import { ConfigService } from '@igo2/core'; + +import jwtDecode from 'jwt-decode'; + import { AuthOptions } from './auth.interface'; @Injectable({ diff --git a/packages/common/src/lib/action/action.module.ts b/packages/common/src/lib/action/action.module.ts index be0d59c10f..2bbf2083bf 100644 --- a/packages/common/src/lib/action/action.module.ts +++ b/packages/common/src/lib/action/action.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { IgoActionbarModule } from './actionbar/actionbar.module'; diff --git a/packages/common/src/lib/action/actionbar/actionbar-item.component.ts b/packages/common/src/lib/action/actionbar/actionbar-item.component.ts index 5ba78e7955..99395a4712 100644 --- a/packages/common/src/lib/action/actionbar/actionbar-item.component.ts +++ b/packages/common/src/lib/action/actionbar/actionbar-item.component.ts @@ -1,11 +1,11 @@ import { + ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, - ChangeDetectionStrategy, + Input, + OnDestroy, OnInit, - OnDestroy + Output } from '@angular/core'; import { BehaviorSubject, Subscription, isObservable } from 'rxjs'; diff --git a/packages/common/src/lib/action/actionbar/actionbar.component.ts b/packages/common/src/lib/action/actionbar/actionbar.component.ts index 89710806f1..c091b53031 100644 --- a/packages/common/src/lib/action/actionbar/actionbar.component.ts +++ b/packages/common/src/lib/action/actionbar/actionbar.component.ts @@ -1,22 +1,24 @@ +import { Overlay } from '@angular/cdk/overlay'; import { + ChangeDetectionStrategy, + ChangeDetectorRef, Component, - Input, + ElementRef, HostBinding, - ChangeDetectorRef, - ChangeDetectionStrategy, + Input, OnChanges, OnDestroy, - SimpleChanges, - ElementRef + SimpleChanges } from '@angular/core'; -import { MediaService, Media } from '@igo2/core'; +import { Media, MediaService } from '@igo2/core'; + +import { BehaviorSubject } from 'rxjs'; + import { EntityStoreWatcher } from '../../entity'; -import { Action } from '../shared/action.interfaces'; import { ActionbarMode } from '../shared/action.enums'; +import { Action } from '../shared/action.interfaces'; import { ActionStore } from '../shared/store'; -import { Overlay } from '@angular/cdk/overlay'; -import { BehaviorSubject } from 'rxjs'; /** * A list of action buttons. diff --git a/packages/common/src/lib/action/actionbar/actionbar.module.ts b/packages/common/src/lib/action/actionbar/actionbar.module.ts index 8c888f0933..e4265e860d 100644 --- a/packages/common/src/lib/action/actionbar/actionbar.module.ts +++ b/packages/common/src/lib/action/actionbar/actionbar.module.ts @@ -1,6 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatCheckboxModule } from '@angular/material/checkbox'; @@ -11,8 +10,8 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import { IgoLanguageModule } from '@igo2/core'; -import { ActionbarComponent } from './actionbar.component'; import { ActionbarItemComponent } from './actionbar-item.component'; +import { ActionbarComponent } from './actionbar.component'; /** * @ignore diff --git a/packages/common/src/lib/backdrop/backdrop.component.spec.ts b/packages/common/src/lib/backdrop/backdrop.component.spec.ts index 192f1bfc36..64d1e5af5c 100644 --- a/packages/common/src/lib/backdrop/backdrop.component.spec.ts +++ b/packages/common/src/lib/backdrop/backdrop.component.spec.ts @@ -1,4 +1,4 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { BackdropComponent } from './backdrop.component'; diff --git a/packages/common/src/lib/backdrop/backdrop.module.ts b/packages/common/src/lib/backdrop/backdrop.module.ts index f56ff93d22..118c89bb03 100644 --- a/packages/common/src/lib/backdrop/backdrop.module.ts +++ b/packages/common/src/lib/backdrop/backdrop.module.ts @@ -1,5 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { BackdropComponent } from './backdrop.component'; diff --git a/packages/common/src/lib/badge-icon/badge-icon.directive.ts b/packages/common/src/lib/badge-icon/badge-icon.directive.ts index c750977c8e..13c7a16736 100644 --- a/packages/common/src/lib/badge-icon/badge-icon.directive.ts +++ b/packages/common/src/lib/badge-icon/badge-icon.directive.ts @@ -1,4 +1,4 @@ -import { Directive, Input, ElementRef, OnInit } from '@angular/core'; +import { Directive, ElementRef, Input, OnInit } from '@angular/core'; import { MatIconRegistry } from '@angular/material/icon'; /** diff --git a/packages/common/src/lib/badge-icon/badge-icon.module.ts b/packages/common/src/lib/badge-icon/badge-icon.module.ts index c2e4490f1e..ee9d197f2c 100644 --- a/packages/common/src/lib/badge-icon/badge-icon.module.ts +++ b/packages/common/src/lib/badge-icon/badge-icon.module.ts @@ -1,8 +1,9 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; -import { IgoBadgeIconDirective } from './badge-icon.directive'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatBadgeModule } from '@angular/material/badge'; import { MatIconModule } from '@angular/material/icon'; +import { IgoBadgeIconDirective } from './badge-icon.directive'; + @NgModule({ imports: [MatBadgeModule, MatIconModule], declarations: [IgoBadgeIconDirective], diff --git a/packages/common/src/lib/clickout/clickout.module.ts b/packages/common/src/lib/clickout/clickout.module.ts index 8ec7d4b9bf..93c2bee2c9 100644 --- a/packages/common/src/lib/clickout/clickout.module.ts +++ b/packages/common/src/lib/clickout/clickout.module.ts @@ -1,4 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + import { ClickoutDirective } from './clickout.directive'; @NgModule({ diff --git a/packages/common/src/lib/clone/clone.module.ts b/packages/common/src/lib/clone/clone.module.ts index bfb11b8a77..01b48538f5 100644 --- a/packages/common/src/lib/clone/clone.module.ts +++ b/packages/common/src/lib/clone/clone.module.ts @@ -1,4 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + import { ClonePipe } from './clone.pipe'; @NgModule({ diff --git a/packages/common/src/lib/collapsible/collapse.directive.spec.ts b/packages/common/src/lib/collapsible/collapse.directive.spec.ts index c9eb192bc0..db1ea8d3bf 100644 --- a/packages/common/src/lib/collapsible/collapse.directive.spec.ts +++ b/packages/common/src/lib/collapsible/collapse.directive.spec.ts @@ -1,5 +1,5 @@ -import { waitForAsync, inject, TestBed } from '@angular/core/testing'; import { ElementRef, Renderer2 } from '@angular/core'; +import { TestBed, inject, waitForAsync } from '@angular/core/testing'; import { CollapseDirective } from './collapse.directive'; diff --git a/packages/common/src/lib/collapsible/collapse.directive.ts b/packages/common/src/lib/collapsible/collapse.directive.ts index 4daff3be58..54f38796cc 100644 --- a/packages/common/src/lib/collapsible/collapse.directive.ts +++ b/packages/common/src/lib/collapsible/collapse.directive.ts @@ -1,10 +1,10 @@ import { Directive, - Input, - Output, + ElementRef, EventEmitter, HostListener, - ElementRef, + Input, + Output, Renderer2 } from '@angular/core'; diff --git a/packages/common/src/lib/collapsible/collapsible.component.spec.ts b/packages/common/src/lib/collapsible/collapsible.component.spec.ts index 84b3e1bfb0..cf931fa1d9 100644 --- a/packages/common/src/lib/collapsible/collapsible.component.spec.ts +++ b/packages/common/src/lib/collapsible/collapsible.component.spec.ts @@ -1,11 +1,10 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; - +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatIconModule } from '@angular/material/icon'; -import { MatListModule } from '@angular/material/list'; import { MatIconTestingModule } from '@angular/material/icon/testing'; +import { MatListModule } from '@angular/material/list'; -import { CollapsibleComponent } from './collapsible.component'; import { CollapseDirective } from './collapse.directive'; +import { CollapsibleComponent } from './collapsible.component'; describe('CollapsibleComponent', () => { let component: CollapsibleComponent; diff --git a/packages/common/src/lib/collapsible/collapsible.component.ts b/packages/common/src/lib/collapsible/collapsible.component.ts index a959bc39b1..c0805a364f 100644 --- a/packages/common/src/lib/collapsible/collapsible.component.ts +++ b/packages/common/src/lib/collapsible/collapsible.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; @Component({ selector: 'igo-collapsible', diff --git a/packages/common/src/lib/collapsible/collapsible.module.ts b/packages/common/src/lib/collapsible/collapsible.module.ts index d695185722..ef08d9e9e2 100644 --- a/packages/common/src/lib/collapsible/collapsible.module.ts +++ b/packages/common/src/lib/collapsible/collapsible.module.ts @@ -1,4 +1,4 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatListModule } from '@angular/material/list'; diff --git a/packages/common/src/lib/color-picker-form-field/color-picker-form-field.component.ts b/packages/common/src/lib/color-picker-form-field/color-picker-form-field.component.ts index d5b689d2e3..ef63268dda 100644 --- a/packages/common/src/lib/color-picker-form-field/color-picker-form-field.component.ts +++ b/packages/common/src/lib/color-picker-form-field/color-picker-form-field.component.ts @@ -1,12 +1,13 @@ import { Component, EventEmitter, - forwardRef, + OnInit, Output, - OnInit + forwardRef } from '@angular/core'; import { Input } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; + import tinycolor from 'tinycolor2'; @Component({ diff --git a/packages/common/src/lib/color-picker-form-field/color-picker-form-field.module.ts b/packages/common/src/lib/color-picker-form-field/color-picker-form-field.module.ts index 3a0d18aecc..40e17640e9 100644 --- a/packages/common/src/lib/color-picker-form-field/color-picker-form-field.module.ts +++ b/packages/common/src/lib/color-picker-form-field/color-picker-form-field.module.ts @@ -1,9 +1,10 @@ import { NgModule } from '@angular/core'; -import { ColorPickerFormFieldComponent } from './color-picker-form-field.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; +import { ColorPickerFormFieldComponent } from './color-picker-form-field.component'; + @NgModule({ imports: [ FormsModule, diff --git a/packages/common/src/lib/confirm-dialog/confirm-dialog.module.ts b/packages/common/src/lib/confirm-dialog/confirm-dialog.module.ts index 3b0897d479..c753c28779 100644 --- a/packages/common/src/lib/confirm-dialog/confirm-dialog.module.ts +++ b/packages/common/src/lib/confirm-dialog/confirm-dialog.module.ts @@ -1,4 +1,4 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; diff --git a/packages/common/src/lib/confirm-dialog/confirm-dialog.service.ts b/packages/common/src/lib/confirm-dialog/confirm-dialog.service.ts index e7a152072b..1e44644971 100644 --- a/packages/common/src/lib/confirm-dialog/confirm-dialog.service.ts +++ b/packages/common/src/lib/confirm-dialog/confirm-dialog.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; + import { LanguageService } from '@igo2/core'; import { Observable } from 'rxjs'; diff --git a/packages/common/src/lib/context-menu/context-menu.directive.ts b/packages/common/src/lib/context-menu/context-menu.directive.ts index eb703f509c..f602246538 100644 --- a/packages/common/src/lib/context-menu/context-menu.directive.ts +++ b/packages/common/src/lib/context-menu/context-menu.directive.ts @@ -1,3 +1,5 @@ +import { Overlay, OverlayRef } from '@angular/cdk/overlay'; +import { TemplatePortal } from '@angular/cdk/portal'; import { Directive, ElementRef, @@ -9,10 +11,8 @@ import { } from '@angular/core'; import type { TemplateRef } from '@angular/core'; -import { TemplatePortal } from '@angular/cdk/portal'; -import { fromEvent, Subscription } from 'rxjs'; +import { Subscription, fromEvent } from 'rxjs'; import { filter, take } from 'rxjs/operators'; -import { Overlay, OverlayRef } from '@angular/cdk/overlay'; @Directive({ selector: '[igoContextMenu]' diff --git a/packages/common/src/lib/context-menu/context-menu.module.ts b/packages/common/src/lib/context-menu/context-menu.module.ts index e19183eafa..ad4a929960 100644 --- a/packages/common/src/lib/context-menu/context-menu.module.ts +++ b/packages/common/src/lib/context-menu/context-menu.module.ts @@ -1,4 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + import { ContextMenuDirective } from './context-menu.directive'; import { LongPressDirective } from './long-press.directive'; diff --git a/packages/common/src/lib/context-menu/long-press.directive.ts b/packages/common/src/lib/context-menu/long-press.directive.ts index afe39eadcf..2691b38e5c 100644 --- a/packages/common/src/lib/context-menu/long-press.directive.ts +++ b/packages/common/src/lib/context-menu/long-press.directive.ts @@ -1,10 +1,11 @@ import { Directive, - HostListener, - Output, EventEmitter, - Input + HostListener, + Input, + Output } from '@angular/core'; + import { userAgent } from '@igo2/utils'; /** diff --git a/packages/common/src/lib/custom-html/custom-html.module.ts b/packages/common/src/lib/custom-html/custom-html.module.ts index bae17f3447..49daa4cb41 100644 --- a/packages/common/src/lib/custom-html/custom-html.module.ts +++ b/packages/common/src/lib/custom-html/custom-html.module.ts @@ -1,5 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; diff --git a/packages/common/src/lib/dom/dom.service.ts b/packages/common/src/lib/dom/dom.service.ts index 6b664a26ce..a5498e0e41 100644 --- a/packages/common/src/lib/dom/dom.service.ts +++ b/packages/common/src/lib/dom/dom.service.ts @@ -1,9 +1,10 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http'; -import { catchError, map } from 'rxjs/operators'; +import { Injectable } from '@angular/core'; + import { throwError } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; import { DOMOptions, DOMValue } from './dom.interfaces'; -import { Injectable } from '@angular/core'; @Injectable({ providedIn: 'root' diff --git a/packages/common/src/lib/drag-drop/drag-drop.directive.ts b/packages/common/src/lib/drag-drop/drag-drop.directive.ts index a28924a47a..19a9736fa6 100644 --- a/packages/common/src/lib/drag-drop/drag-drop.directive.ts +++ b/packages/common/src/lib/drag-drop/drag-drop.directive.ts @@ -1,10 +1,10 @@ import { Directive, - HostListener, - HostBinding, EventEmitter, - Output, - Input + HostBinding, + HostListener, + Input, + Output } from '@angular/core'; @Directive({ diff --git a/packages/common/src/lib/drag-drop/drag-drop.module.ts b/packages/common/src/lib/drag-drop/drag-drop.module.ts index e540300993..ebe0691323 100644 --- a/packages/common/src/lib/drag-drop/drag-drop.module.ts +++ b/packages/common/src/lib/drag-drop/drag-drop.module.ts @@ -1,4 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + import { DragAndDropDirective } from './drag-drop.directive'; @NgModule({ diff --git a/packages/common/src/lib/dynamic-component/dynamic-component.module.ts b/packages/common/src/lib/dynamic-component/dynamic-component.module.ts index 9a321e0627..52e3517f25 100644 --- a/packages/common/src/lib/dynamic-component/dynamic-component.module.ts +++ b/packages/common/src/lib/dynamic-component/dynamic-component.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { IgoDynamicOutletModule } from './dynamic-outlet/dynamic-outlet.module'; import { DynamicComponentService } from './shared/dynamic-component.service'; diff --git a/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.component.ts b/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.component.ts index d739f4c9ef..86265d6606 100644 --- a/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.component.ts +++ b/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.component.ts @@ -1,13 +1,13 @@ import { - Input, - ChangeDetectorRef, ChangeDetectionStrategy, + ChangeDetectorRef, Component, + Input, OnChanges, OnDestroy, SimpleChanges, - ViewContainerRef, - ViewChild + ViewChild, + ViewContainerRef } from '@angular/core'; import { ObjectUtils } from '@igo2/utils'; diff --git a/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.module.ts b/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.module.ts index e274eeea1c..e3601a1a55 100644 --- a/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.module.ts +++ b/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { DynamicOutletComponent } from './dynamic-outlet.component'; diff --git a/packages/common/src/lib/entity/entity-selector/entity-selector.component.ts b/packages/common/src/lib/entity/entity-selector/entity-selector.component.ts index 0506b2cae0..3263d92219 100644 --- a/packages/common/src/lib/entity/entity-selector/entity-selector.component.ts +++ b/packages/common/src/lib/entity/entity-selector/entity-selector.component.ts @@ -1,20 +1,20 @@ import { - Component, - Input, - Output, - EventEmitter, ChangeDetectionStrategy, ChangeDetectorRef, + Component, + EventEmitter, + Input, + OnDestroy, OnInit, - OnDestroy + Output } from '@angular/core'; import { BehaviorSubject, Subscription } from 'rxjs'; import { EntityRecord } from '../shared/entity.interfaces'; +import { getEntityTitle } from '../shared/entity.utils'; import { EntityStore } from '../shared/store'; import { EntityStoreWatcher } from '../shared/watcher'; -import { getEntityTitle } from '../shared/entity.utils'; @Component({ selector: 'igo-entity-selector', diff --git a/packages/common/src/lib/entity/entity-selector/entity-selector.module.ts b/packages/common/src/lib/entity/entity-selector/entity-selector.module.ts index 3d289bf44e..d4f1d8f79c 100644 --- a/packages/common/src/lib/entity/entity-selector/entity-selector.module.ts +++ b/packages/common/src/lib/entity/entity-selector/entity-selector.module.ts @@ -1,7 +1,6 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; - import { MatSelectModule } from '@angular/material/select'; import { EntitySelectorComponent } from './entity-selector.component'; diff --git a/packages/common/src/lib/entity/entity-table-paginator/entity-table-paginator.component.ts b/packages/common/src/lib/entity/entity-table-paginator/entity-table-paginator.component.ts index ef57de38ff..f5eacdd712 100644 --- a/packages/common/src/lib/entity/entity-table-paginator/entity-table-paginator.component.ts +++ b/packages/common/src/lib/entity/entity-table-paginator/entity-table-paginator.component.ts @@ -1,18 +1,20 @@ import { + ChangeDetectionStrategy, Component, + EventEmitter, Input, - ChangeDetectionStrategy, OnChanges, - ViewChild, + OnDestroy, Output, - EventEmitter, - OnDestroy + ViewChild } from '@angular/core'; - -import { EntityStore } from '../shared'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; -import { BehaviorSubject, Subscription } from 'rxjs'; + import { LanguageService, MediaService } from '@igo2/core'; + +import { BehaviorSubject, Subscription } from 'rxjs'; + +import { EntityStore } from '../shared'; import { EntityTablePaginatorOptions } from './entity-table-paginator.interface'; @Component({ diff --git a/packages/common/src/lib/entity/entity-table-paginator/entity-table-paginator.module.ts b/packages/common/src/lib/entity/entity-table-paginator/entity-table-paginator.module.ts index 43ad72a126..96f00d4f46 100644 --- a/packages/common/src/lib/entity/entity-table-paginator/entity-table-paginator.module.ts +++ b/packages/common/src/lib/entity/entity-table-paginator/entity-table-paginator.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; -import { EntityTablePaginatorComponent } from './entity-table-paginator.component'; import { MatPaginatorModule } from '@angular/material/paginator'; +import { EntityTablePaginatorComponent } from './entity-table-paginator.component'; + /** * @ignore */ diff --git a/packages/common/src/lib/entity/entity-table/entity-table-row.directive.ts b/packages/common/src/lib/entity/entity-table/entity-table-row.directive.ts index 47674e41df..fb830af19b 100644 --- a/packages/common/src/lib/entity/entity-table/entity-table-row.directive.ts +++ b/packages/common/src/lib/entity/entity-table/entity-table-row.directive.ts @@ -1,11 +1,11 @@ import { Directive, - Input, ElementRef, - Renderer2, EventEmitter, + HostListener, + Input, Output, - HostListener + Renderer2 } from '@angular/core'; import scrollIntoView from 'scroll-into-view-if-needed'; diff --git a/packages/common/src/lib/entity/entity-table/entity-table.component.ts b/packages/common/src/lib/entity/entity-table/entity-table.component.ts index 028d6da70e..4783bd6d20 100644 --- a/packages/common/src/lib/entity/entity-table/entity-table.component.ts +++ b/packages/common/src/lib/entity/entity-table/entity-table.component.ts @@ -1,48 +1,49 @@ +import { FocusMonitor } from '@angular/cdk/a11y'; import { - Component, - Input, - Output, - EventEmitter, ChangeDetectionStrategy, ChangeDetectorRef, - OnInit, - OnDestroy, - OnChanges, - SimpleChanges, + Component, ElementRef, + EventEmitter, + Input, + OnChanges, + OnDestroy, + OnInit, Optional, - Self + Output, + Self, + SimpleChanges } from '@angular/core'; +import { + FormControlName, + NgControl, + NgForm, + UntypedFormBuilder, + UntypedFormGroup +} from '@angular/forms'; +import { DateAdapter, ErrorStateMatcher } from '@angular/material/core'; +import { MatFormFieldControl } from '@angular/material/form-field'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatTableDataSource } from '@angular/material/table'; + +import { StringUtils } from '@igo2/utils'; +import { default as moment } from 'moment'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; +import { debounceTime, map } from 'rxjs/operators'; +import { EntityTablePaginatorOptions } from '../entity-table-paginator/entity-table-paginator.interface'; import { EntityKey, EntityRecord, EntityState, EntityStore, - EntityTableTemplate, EntityTableColumn, EntityTableColumnRenderer, + EntityTableScrollBehavior, EntityTableSelectionState, - EntityTableScrollBehavior + EntityTableTemplate } from '../shared'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; -import { EntityTablePaginatorOptions } from '../entity-table-paginator/entity-table-paginator.interface'; -import { MatFormFieldControl } from '@angular/material/form-field'; -import { - UntypedFormBuilder, - NgControl, - NgForm, - FormControlName, - UntypedFormGroup -} from '@angular/forms'; -import { FocusMonitor } from '@angular/cdk/a11y'; -import { DateAdapter, ErrorStateMatcher } from '@angular/material/core'; -import { debounceTime, map } from 'rxjs/operators'; -import { default as moment } from 'moment'; -import { StringUtils } from '@igo2/utils'; interface CellData { [key: string]: { diff --git a/packages/common/src/lib/entity/entity-table/entity-table.module.ts b/packages/common/src/lib/entity/entity-table/entity-table.module.ts index 3148e53131..b1af612424 100644 --- a/packages/common/src/lib/entity/entity-table/entity-table.module.ts +++ b/packages/common/src/lib/entity/entity-table/entity-table.module.ts @@ -1,25 +1,26 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatButtonModule } from '@angular/material/button'; import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatSelectModule } from '@angular/material/select'; import { MatSortModule } from '@angular/material/sort'; import { MatTableModule } from '@angular/material/table'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatTooltipModule } from '@angular/material/tooltip'; + +import { IgoLanguageModule } from '@igo2/core'; -import { IgoStopPropagationModule } from '../../stop-propagation/stop-propagation.module'; import { IgoCustomHtmlModule } from '../../custom-html/custom-html.module'; +import { IgoImageModule } from '../../image/image.module'; +import { IgoStopPropagationModule } from '../../stop-propagation/stop-propagation.module'; +import { IgoEntityTablePaginatorModule } from '../entity-table-paginator/entity-table-paginator.module'; import { EntityTableRowDirective } from './entity-table-row.directive'; import { EntityTableComponent } from './entity-table.component'; -import { MatPaginatorModule } from '@angular/material/paginator'; -import { IgoEntityTablePaginatorModule } from '../entity-table-paginator/entity-table-paginator.module'; -import { IgoImageModule } from '../../image/image.module'; -import { IgoLanguageModule } from '@igo2/core'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MatInputModule } from '@angular/material/input'; -import { MatTooltipModule } from '@angular/material/tooltip'; -import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatSelectModule } from '@angular/material/select'; /** * @ignore diff --git a/packages/common/src/lib/entity/entity.module.ts b/packages/common/src/lib/entity/entity.module.ts index 2142206def..1bbb47956b 100644 --- a/packages/common/src/lib/entity/entity.module.ts +++ b/packages/common/src/lib/entity/entity.module.ts @@ -1,9 +1,9 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { IgoEntitySelectorModule } from './entity-selector/entity-selector.module'; -import { IgoEntityTableModule } from './entity-table/entity-table.module'; import { IgoEntityTablePaginatorModule } from './entity-table-paginator/entity-table-paginator.module'; +import { IgoEntityTableModule } from './entity-table/entity-table.module'; @NgModule({ imports: [CommonModule], diff --git a/packages/common/src/lib/entity/shared/store-strategy.ts b/packages/common/src/lib/entity/shared/store-strategy.ts index 8073a4b054..1180d48e2d 100644 --- a/packages/common/src/lib/entity/shared/store-strategy.ts +++ b/packages/common/src/lib/entity/shared/store-strategy.ts @@ -1,6 +1,6 @@ import { EntityState } from './entity.interfaces'; -import { EntityStoreStrategy } from './strategies/strategy'; import { EntityStore, EntityStoreOptions } from './store'; +import { EntityStoreStrategy } from './strategies/strategy'; export class EntityStoreWithStrategy< E extends object = object, diff --git a/packages/common/src/lib/entity/shared/store.ts b/packages/common/src/lib/entity/shared/store.ts index 2a2f643809..85a8f0434a 100644 --- a/packages/common/src/lib/entity/shared/store.ts +++ b/packages/common/src/lib/entity/shared/store.ts @@ -1,9 +1,9 @@ import { BehaviorSubject } from 'rxjs'; +import { EntityKey, EntityRecord, EntityState } from './entity.interfaces'; +import { getEntityId, getEntityProperty } from './entity.utils'; import { EntityStateManager } from './state'; import { EntityView } from './view'; -import { EntityKey, EntityState, EntityRecord } from './entity.interfaces'; -import { getEntityId, getEntityProperty } from './entity.utils'; export interface EntityStoreOptions { getKey?: (entity: object) => EntityKey; diff --git a/packages/common/src/lib/entity/shared/transaction.ts b/packages/common/src/lib/entity/shared/transaction.ts index 71135cd6a4..f408b1a0eb 100644 --- a/packages/common/src/lib/entity/shared/transaction.ts +++ b/packages/common/src/lib/entity/shared/transaction.ts @@ -1,16 +1,15 @@ import { Observable, of } from 'rxjs'; -import { catchError, tap } from 'rxjs/operators'; - import { BehaviorSubject } from 'rxjs'; +import { catchError, tap } from 'rxjs/operators'; +import { EntityOperationType } from './entity.enums'; import { EntityKey, - EntityTransactionOptions, - EntityOperationState + EntityOperationState, + EntityTransactionOptions } from './entity.interfaces'; -import { EntityStore } from './store'; -import { EntityOperationType } from './entity.enums'; import { getEntityId } from './entity.utils'; +import { EntityStore } from './store'; interface EntityOperation { key: EntityKey; diff --git a/packages/common/src/lib/entity/shared/view.ts b/packages/common/src/lib/entity/shared/view.ts index 87e6caf2e5..3bc1d5d031 100644 --- a/packages/common/src/lib/entity/shared/view.ts +++ b/packages/common/src/lib/entity/shared/view.ts @@ -1,12 +1,13 @@ +import { ObjectUtils, uuid } from '@igo2/utils'; + import { BehaviorSubject, Observable, Subscription, combineLatest } from 'rxjs'; import { debounceTime, map, skip } from 'rxjs/operators'; -import { ObjectUtils, uuid } from '@igo2/utils'; import { - EntityKey, EntityFilterClause, - EntitySortClause, - EntityJoinClause + EntityJoinClause, + EntityKey, + EntitySortClause } from './entity.interfaces'; /** diff --git a/packages/common/src/lib/entity/shared/watcher.ts b/packages/common/src/lib/entity/shared/watcher.ts index 5316b8782e..461900c7f4 100644 --- a/packages/common/src/lib/entity/shared/watcher.ts +++ b/packages/common/src/lib/entity/shared/watcher.ts @@ -1,11 +1,11 @@ import { ChangeDetectorRef } from '@angular/core'; +import { ObjectUtils } from '@igo2/utils'; + import { Subscription } from 'rxjs'; import { skip } from 'rxjs/operators'; -import { ObjectUtils } from '@igo2/utils'; import { EntityKey } from './entity.interfaces'; - import { EntityStore } from './store'; /** diff --git a/packages/common/src/lib/flexible/flexible.component.spec.ts b/packages/common/src/lib/flexible/flexible.component.spec.ts index 0606cea092..2ff4394c55 100644 --- a/packages/common/src/lib/flexible/flexible.component.spec.ts +++ b/packages/common/src/lib/flexible/flexible.component.spec.ts @@ -1,6 +1,7 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MediaService } from '@igo2/core'; + import { FlexibleComponent } from './flexible.component'; describe('FlexibleComponent', () => { diff --git a/packages/common/src/lib/flexible/flexible.component.ts b/packages/common/src/lib/flexible/flexible.component.ts index fea8e7f377..01dbd728bf 100644 --- a/packages/common/src/lib/flexible/flexible.component.ts +++ b/packages/common/src/lib/flexible/flexible.component.ts @@ -1,16 +1,17 @@ import { Component, - OnInit, - OnDestroy, + ElementRef, Input, - ViewChild, - ElementRef + OnDestroy, + OnInit, + ViewChild } from '@angular/core'; -import { Subscription } from 'rxjs'; import { Media, MediaService } from '@igo2/core'; -import { FlexibleState, FlexibleDirection } from './flexible.type'; +import { Subscription } from 'rxjs'; + +import { FlexibleDirection, FlexibleState } from './flexible.type'; @Component({ selector: 'igo-flexible', diff --git a/packages/common/src/lib/flexible/flexible.module.ts b/packages/common/src/lib/flexible/flexible.module.ts index 075d164885..de09742e4a 100644 --- a/packages/common/src/lib/flexible/flexible.module.ts +++ b/packages/common/src/lib/flexible/flexible.module.ts @@ -1,4 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + import { FlexibleComponent } from './flexible.component'; @NgModule({ diff --git a/packages/common/src/lib/form/form-field/form-field-select.component.ts b/packages/common/src/lib/form/form-field/form-field-select.component.ts index 5f517e41ab..1f888997f9 100644 --- a/packages/common/src/lib/form/form-field/form-field-select.component.ts +++ b/packages/common/src/lib/form/form-field/form-field-select.component.ts @@ -1,19 +1,19 @@ import { - Input, - Component, ChangeDetectionStrategy, + Component, + Input, OnInit } from '@angular/core'; import type { UntypedFormControl } from '@angular/forms'; import { BehaviorSubject } from 'rxjs'; +import { IgoFormFieldComponent } from '../shared/form-field-component'; +import { FormFieldSelectChoice } from '../shared/form.interfaces'; import { formControlIsRequired, getControlErrorMessage } from '../shared/form.utils'; -import { FormFieldSelectChoice } from '../shared/form.interfaces'; -import { IgoFormFieldComponent } from '../shared/form-field-component'; /** * This component renders a select field diff --git a/packages/common/src/lib/form/form-field/form-field-text.component.ts b/packages/common/src/lib/form/form-field/form-field-text.component.ts index 6a8e912c5f..23dc4aff73 100644 --- a/packages/common/src/lib/form/form-field/form-field-text.component.ts +++ b/packages/common/src/lib/form/form-field/form-field-text.component.ts @@ -1,18 +1,18 @@ import { - Input, - Component, ChangeDetectionStrategy, + Component, + Input, OnInit } from '@angular/core'; import type { UntypedFormControl } from '@angular/forms'; import { BehaviorSubject } from 'rxjs'; +import { IgoFormFieldComponent } from '../shared/form-field-component'; import { formControlIsRequired, getControlErrorMessage } from '../shared/form.utils'; -import { IgoFormFieldComponent } from '../shared/form-field-component'; /** * This component renders a text field diff --git a/packages/common/src/lib/form/form-field/form-field-textarea.component.ts b/packages/common/src/lib/form/form-field/form-field-textarea.component.ts index dae3e860bf..c174d4514a 100644 --- a/packages/common/src/lib/form/form-field/form-field-textarea.component.ts +++ b/packages/common/src/lib/form/form-field/form-field-textarea.component.ts @@ -1,18 +1,18 @@ import { - Input, - Component, ChangeDetectionStrategy, + Component, + Input, OnInit } from '@angular/core'; import type { UntypedFormControl } from '@angular/forms'; import { BehaviorSubject } from 'rxjs'; +import { IgoFormFieldComponent } from '../shared/form-field-component'; import { formControlIsRequired, getControlErrorMessage } from '../shared/form.utils'; -import { IgoFormFieldComponent } from '../shared/form-field-component'; /** * This component renders a textarea field diff --git a/packages/common/src/lib/form/form-field/form-field.component.ts b/packages/common/src/lib/form/form-field/form-field.component.ts index f9d0b8f1d0..b1612a7a4a 100644 --- a/packages/common/src/lib/form/form-field/form-field.component.ts +++ b/packages/common/src/lib/form/form-field/form-field.component.ts @@ -1,13 +1,13 @@ -import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { getDefaultErrorMessages } from '../shared'; +import { FormFieldService } from '../shared/form-field.service'; import { FormField, FormFieldInputs, FormFieldOptions, FormFieldSubscribers } from '../shared/form.interfaces'; -import { FormFieldService } from '../shared/form-field.service'; -import { getDefaultErrorMessages } from '../shared'; /** * This component renders the proper form input based on diff --git a/packages/common/src/lib/form/form-field/form-field.module.ts b/packages/common/src/lib/form/form-field/form-field.module.ts index e32d56718d..61edea6869 100644 --- a/packages/common/src/lib/form/form-field/form-field.module.ts +++ b/packages/common/src/lib/form/form-field/form-field.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; @@ -7,12 +7,12 @@ import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { IgoLanguageModule } from '@igo2/core'; -import { IgoDynamicOutletModule } from '../../dynamic-component/dynamic-outlet/dynamic-outlet.module'; -import { FormFieldComponent } from './form-field.component'; +import { IgoDynamicOutletModule } from '../../dynamic-component/dynamic-outlet/dynamic-outlet.module'; import { FormFieldSelectComponent } from './form-field-select.component'; import { FormFieldTextComponent } from './form-field-text.component'; import { FormFieldTextareaComponent } from './form-field-textarea.component'; +import { FormFieldComponent } from './form-field.component'; /** * @ignore diff --git a/packages/common/src/lib/form/form-group/form-group.component.ts b/packages/common/src/lib/form/form-group/form-group.component.ts index 2b63bfe5b1..dfb44c2d3d 100644 --- a/packages/common/src/lib/form/form-group/form-group.component.ts +++ b/packages/common/src/lib/form/form-group/form-group.component.ts @@ -1,8 +1,8 @@ -import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { getControlErrorMessage } from '../shared/form.utils'; import { FormField, FormFieldGroup } from '../shared/form.interfaces'; +import { getControlErrorMessage } from '../shared/form.utils'; /** * A configurable form, optionnally bound to an entity diff --git a/packages/common/src/lib/form/form-group/form-group.module.ts b/packages/common/src/lib/form/form-group/form-group.module.ts index 1c0dd2fa49..2baaa6e8e3 100644 --- a/packages/common/src/lib/form/form-group/form-group.module.ts +++ b/packages/common/src/lib/form/form-group/form-group.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { IgoLanguageModule } from '@igo2/core'; diff --git a/packages/common/src/lib/form/form.module.ts b/packages/common/src/lib/form/form.module.ts index 2575fcac28..b1722f2b97 100644 --- a/packages/common/src/lib/form/form.module.ts +++ b/packages/common/src/lib/form/form.module.ts @@ -1,11 +1,11 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; -import { IgoFormFormModule } from './form/form.module'; -import { IgoFormGroupModule } from './form-group/form-group.module'; import { IgoFormFieldModule } from './form-field/form-field.module'; -import { FormService } from './shared/form.service'; +import { IgoFormGroupModule } from './form-group/form-group.module'; +import { IgoFormFormModule } from './form/form.module'; import { FormFieldService } from './shared/form-field.service'; +import { FormService } from './shared/form.service'; /** * @ignore diff --git a/packages/common/src/lib/form/form/form.component.ts b/packages/common/src/lib/form/form/form.component.ts index 8003ec099b..ede00759c8 100644 --- a/packages/common/src/lib/form/form/form.component.ts +++ b/packages/common/src/lib/form/form/form.component.ts @@ -1,13 +1,13 @@ import { + ChangeDetectionStrategy, Component, - Input, - Output, + ElementRef, EventEmitter, + Input, OnChanges, + Output, SimpleChanges, - ChangeDetectionStrategy, - ViewChild, - ElementRef + ViewChild } from '@angular/core'; import { t } from 'typy'; diff --git a/packages/common/src/lib/form/form/form.module.ts b/packages/common/src/lib/form/form/form.module.ts index 1441bce21e..2b97def395 100644 --- a/packages/common/src/lib/form/form/form.module.ts +++ b/packages/common/src/lib/form/form/form.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormComponent } from './form.component'; diff --git a/packages/common/src/lib/form/shared/form.interfaces.ts b/packages/common/src/lib/form/shared/form.interfaces.ts index 4862a92081..0027f0c894 100644 --- a/packages/common/src/lib/form/shared/form.interfaces.ts +++ b/packages/common/src/lib/form/shared/form.interfaces.ts @@ -3,6 +3,7 @@ import { UntypedFormGroup, ValidatorFn } from '@angular/forms'; + import { BehaviorSubject } from 'rxjs'; export interface Form { diff --git a/packages/common/src/lib/form/shared/form.service.ts b/packages/common/src/lib/form/shared/form.service.ts index 144934aae1..94dc1005f9 100644 --- a/packages/common/src/lib/form/shared/form.service.ts +++ b/packages/common/src/lib/form/shared/form.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { UntypedFormBuilder, Validators, ValidatorFn } from '@angular/forms'; +import { UntypedFormBuilder, ValidatorFn, Validators } from '@angular/forms'; import { Form, diff --git a/packages/common/src/lib/home-button/home-button.module.ts b/packages/common/src/lib/home-button/home-button.module.ts index 4fe6d82801..d4f86e107d 100644 --- a/packages/common/src/lib/home-button/home-button.module.ts +++ b/packages/common/src/lib/home-button/home-button.module.ts @@ -1,11 +1,11 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { IgoLanguageModule } from '@igo2/core'; - +import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { IgoLanguageModule } from '@igo2/core'; + import { HomeButtonComponent } from './home-button.component'; /** diff --git a/packages/common/src/lib/image/image-error.directive.ts b/packages/common/src/lib/image/image-error.directive.ts index 02659d8192..52b25320da 100644 --- a/packages/common/src/lib/image/image-error.directive.ts +++ b/packages/common/src/lib/image/image-error.directive.ts @@ -1,4 +1,4 @@ -import { Directive, HostListener, Input, ElementRef } from '@angular/core'; +import { Directive, ElementRef, HostListener, Input } from '@angular/core'; @Directive({ selector: '[igoImageError]' diff --git a/packages/common/src/lib/image/image.module.ts b/packages/common/src/lib/image/image.module.ts index 0df301aa0f..da4dd2b4f3 100644 --- a/packages/common/src/lib/image/image.module.ts +++ b/packages/common/src/lib/image/image.module.ts @@ -1,4 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + import { ImageErrorDirective } from './image-error.directive'; import { SecureImagePipe } from './secure-image.pipe'; diff --git a/packages/common/src/lib/image/secure-image.pipe.ts b/packages/common/src/lib/image/secure-image.pipe.ts index 3c86efc4d0..cab1dce082 100644 --- a/packages/common/src/lib/image/secure-image.pipe.ts +++ b/packages/common/src/lib/image/secure-image.pipe.ts @@ -1,10 +1,11 @@ -import { Pipe, PipeTransform } from '@angular/core'; import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { Pipe, PipeTransform } from '@angular/core'; + +import { ConfigService } from '@igo2/core'; -import { Cacheable } from 'ts-cacheable'; import { Observable } from 'rxjs'; import { catchError, switchMap } from 'rxjs/operators'; -import { ConfigService } from '@igo2/core'; +import { Cacheable } from 'ts-cacheable'; @Pipe({ name: 'secureImage' diff --git a/packages/common/src/lib/interactive-tour/interactive-tour.component.ts b/packages/common/src/lib/interactive-tour/interactive-tour.component.ts index a5e0e2ba26..33d8ac63d3 100644 --- a/packages/common/src/lib/interactive-tour/interactive-tour.component.ts +++ b/packages/common/src/lib/interactive-tour/interactive-tour.component.ts @@ -1,8 +1,10 @@ -import { Component, ViewEncapsulation, Input } from '@angular/core'; -import { InteractiveTourService } from './interactive-tour.service'; -import { ToolService } from '../tool/shared/tool.service'; +import { Component, Input, ViewEncapsulation } from '@angular/core'; + import { Observable, of } from 'rxjs'; +import { ToolService } from '../tool/shared/tool.service'; +import { InteractiveTourService } from './interactive-tour.service'; + @Component({ selector: 'igo-interactive-tour', templateUrl: './interactive-tour.component.html', diff --git a/packages/common/src/lib/interactive-tour/interactive-tour.loader.ts b/packages/common/src/lib/interactive-tour/interactive-tour.loader.ts index 7d34d93c91..5ceb90d0c1 100644 --- a/packages/common/src/lib/interactive-tour/interactive-tour.loader.ts +++ b/packages/common/src/lib/interactive-tour/interactive-tour.loader.ts @@ -1,10 +1,13 @@ -import { catchError } from 'rxjs/operators'; import { HttpClient } from '@angular/common/http'; -import { Observable } from 'rxjs'; import { Injectable } from '@angular/core'; -import { InteractiveTourOptions } from './interactive-tour.interface'; + import { ConfigService } from '@igo2/core'; +import { Observable } from 'rxjs'; +import { catchError } from 'rxjs/operators'; + +import { InteractiveTourOptions } from './interactive-tour.interface'; + @Injectable() export class InteractiveTourLoader { private jsonURL: string; diff --git a/packages/common/src/lib/interactive-tour/interactive-tour.module.ts b/packages/common/src/lib/interactive-tour/interactive-tour.module.ts index 6581f917ae..95ba2ac9a1 100644 --- a/packages/common/src/lib/interactive-tour/interactive-tour.module.ts +++ b/packages/common/src/lib/interactive-tour/interactive-tour.module.ts @@ -1,13 +1,14 @@ +import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { MatTooltipModule } from '@angular/material/tooltip'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { CommonModule } from '@angular/common'; +import { MatTooltipModule } from '@angular/material/tooltip'; import { IgoLanguageModule } from '@igo2/core'; -import { InteractiveTourService } from './interactive-tour.service'; + import { InteractiveTourComponent } from './interactive-tour.component'; import { InteractiveTourLoader } from './interactive-tour.loader'; +import { InteractiveTourService } from './interactive-tour.service'; @NgModule({ declarations: [InteractiveTourComponent], diff --git a/packages/common/src/lib/interactive-tour/interactive-tour.service.ts b/packages/common/src/lib/interactive-tour/interactive-tour.service.ts index ead06d27c1..7c96653881 100644 --- a/packages/common/src/lib/interactive-tour/interactive-tour.service.ts +++ b/packages/common/src/lib/interactive-tour/interactive-tour.service.ts @@ -1,15 +1,17 @@ import { Injectable } from '@angular/core'; + +import { ConfigService, LanguageService, MediaService } from '@igo2/core'; + +import { offset } from '@floating-ui/dom'; import { ShepherdService } from 'angular-shepherd'; import Shepherd from 'shepherd.js'; -import { offset } from '@floating-ui/dom'; -import { ConfigService, MediaService, LanguageService } from '@igo2/core'; -import { InteractiveTourLoader } from './interactive-tour.loader'; import { + InteractiveTourAction, InteractiveTourOptions, - InteractiveTourStep, - InteractiveTourAction + InteractiveTourStep } from './interactive-tour.interface'; +import { InteractiveTourLoader } from './interactive-tour.loader'; @Injectable({ providedIn: 'root' diff --git a/packages/common/src/lib/json-dialog/json-dialog.module.ts b/packages/common/src/lib/json-dialog/json-dialog.module.ts index 81104c0bb0..f41288cb6f 100644 --- a/packages/common/src/lib/json-dialog/json-dialog.module.ts +++ b/packages/common/src/lib/json-dialog/json-dialog.module.ts @@ -1,10 +1,9 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { IgoKeyValueModule } from '../keyvalue/keyvalue.module'; - import { JsonDialogComponent } from './json-dialog.component'; import { JsonDialogService } from './json-dialog.service'; diff --git a/packages/common/src/lib/keyvalue/keyvalue.module.ts b/packages/common/src/lib/keyvalue/keyvalue.module.ts index 5b199b0e6e..b114cbdbfc 100644 --- a/packages/common/src/lib/keyvalue/keyvalue.module.ts +++ b/packages/common/src/lib/keyvalue/keyvalue.module.ts @@ -1,4 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + import { KeyValuePipe } from './keyvalue.pipe'; @NgModule({ diff --git a/packages/common/src/lib/list/list-item.directive.spec.ts b/packages/common/src/lib/list/list-item.directive.spec.ts index 408fa996b2..13d5af693b 100644 --- a/packages/common/src/lib/list/list-item.directive.spec.ts +++ b/packages/common/src/lib/list/list-item.directive.spec.ts @@ -1,4 +1,5 @@ import { ElementRef } from '@angular/core'; + import { ListItemDirective } from './list-item.directive'; export class MockElementRef extends ElementRef {} diff --git a/packages/common/src/lib/list/list-item.directive.ts b/packages/common/src/lib/list/list-item.directive.ts index f39c6080ce..1f1fc3f3b0 100644 --- a/packages/common/src/lib/list/list-item.directive.ts +++ b/packages/common/src/lib/list/list-item.directive.ts @@ -1,11 +1,11 @@ import { Directive, - Input, - Output, ElementRef, - Renderer2, + EventEmitter, HostListener, - EventEmitter + Input, + Output, + Renderer2 } from '@angular/core'; @Directive({ diff --git a/packages/common/src/lib/list/list.component.spec.ts b/packages/common/src/lib/list/list.component.spec.ts index 4d4378d3c9..17cd51542c 100644 --- a/packages/common/src/lib/list/list.component.spec.ts +++ b/packages/common/src/lib/list/list.component.spec.ts @@ -1,5 +1,4 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; - +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatListModule } from '@angular/material/list'; import { ListComponent } from './list.component'; diff --git a/packages/common/src/lib/list/list.component.ts b/packages/common/src/lib/list/list.component.ts index c8e414e20c..4ba66d9e48 100644 --- a/packages/common/src/lib/list/list.component.ts +++ b/packages/common/src/lib/list/list.component.ts @@ -1,12 +1,12 @@ import { - Component, AfterViewInit, - OnInit, - OnDestroy, - Input, + Component, ContentChildren, + ElementRef, HostListener, - ElementRef + Input, + OnDestroy, + OnInit } from '@angular/core'; import type { QueryList } from '@angular/core'; diff --git a/packages/common/src/lib/list/list.module.ts b/packages/common/src/lib/list/list.module.ts index 15ee6dd1c2..84425ed80b 100644 --- a/packages/common/src/lib/list/list.module.ts +++ b/packages/common/src/lib/list/list.module.ts @@ -1,10 +1,9 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatListModule } from '@angular/material/list'; import { IgoClickoutModule } from '../clickout/clickout.module'; - import { ListItemDirective } from './list-item.directive'; import { ListComponent } from './list.component'; diff --git a/packages/common/src/lib/panel/panel.component.spec.ts b/packages/common/src/lib/panel/panel.component.spec.ts index 5532cd4272..b052aaf13a 100644 --- a/packages/common/src/lib/panel/panel.component.spec.ts +++ b/packages/common/src/lib/panel/panel.component.spec.ts @@ -1,4 +1,4 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { PanelComponent } from './panel.component'; diff --git a/packages/common/src/lib/panel/panel.component.ts b/packages/common/src/lib/panel/panel.component.ts index a20dc45d45..48acfdaa12 100644 --- a/packages/common/src/lib/panel/panel.component.ts +++ b/packages/common/src/lib/panel/panel.component.ts @@ -1,8 +1,8 @@ import { - Component, - Input, ChangeDetectionStrategy, - HostBinding + Component, + HostBinding, + Input } from '@angular/core'; @Component({ diff --git a/packages/common/src/lib/panel/panel.module.ts b/packages/common/src/lib/panel/panel.module.ts index 5c920cea73..b9c2a6a64b 100644 --- a/packages/common/src/lib/panel/panel.module.ts +++ b/packages/common/src/lib/panel/panel.module.ts @@ -1,5 +1,6 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; + import { PanelComponent } from './panel.component'; @NgModule({ diff --git a/packages/common/src/lib/sidenav/sidenav-shim.directive.ts b/packages/common/src/lib/sidenav/sidenav-shim.directive.ts index c96495454f..d1e011f39a 100644 --- a/packages/common/src/lib/sidenav/sidenav-shim.directive.ts +++ b/packages/common/src/lib/sidenav/sidenav-shim.directive.ts @@ -1,4 +1,4 @@ -import { Directive, Self, HostListener, Renderer2 } from '@angular/core'; +import { Directive, HostListener, Renderer2, Self } from '@angular/core'; import { MatSidenav } from '@angular/material/sidenav'; /** diff --git a/packages/common/src/lib/sidenav/sidenav.module.ts b/packages/common/src/lib/sidenav/sidenav.module.ts index 42edb1c42c..6f52288a24 100644 --- a/packages/common/src/lib/sidenav/sidenav.module.ts +++ b/packages/common/src/lib/sidenav/sidenav.module.ts @@ -1,4 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + import { SidenavShimDirective } from './sidenav-shim.directive'; @NgModule({ diff --git a/packages/common/src/lib/spinner/spinner-activity.directive.ts b/packages/common/src/lib/spinner/spinner-activity.directive.ts index 6367b99da0..41cc4e20d5 100644 --- a/packages/common/src/lib/spinner/spinner-activity.directive.ts +++ b/packages/common/src/lib/spinner/spinner-activity.directive.ts @@ -1,8 +1,10 @@ -import { Directive, Self, OnInit, OnDestroy } from '@angular/core'; +import { Directive, OnDestroy, OnInit, Self } from '@angular/core'; + +import { ActivityService } from '@igo2/core'; + import { Subscription } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; -import { ActivityService } from '@igo2/core'; import { SpinnerComponent } from './spinner.component'; /** diff --git a/packages/common/src/lib/spinner/spinner.component.spec.ts b/packages/common/src/lib/spinner/spinner.component.spec.ts index 812b2d79d5..eb34530ad3 100644 --- a/packages/common/src/lib/spinner/spinner.component.spec.ts +++ b/packages/common/src/lib/spinner/spinner.component.spec.ts @@ -1,5 +1,4 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; - +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatProgressSpinner } from '@angular/material/progress-spinner'; import { SpinnerComponent } from './spinner.component'; diff --git a/packages/common/src/lib/spinner/spinner.module.ts b/packages/common/src/lib/spinner/spinner.module.ts index 738053481b..08eaf499cd 100644 --- a/packages/common/src/lib/spinner/spinner.module.ts +++ b/packages/common/src/lib/spinner/spinner.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { SpinnerActivityDirective } from './spinner-activity.directive'; diff --git a/packages/common/src/lib/stop-propagation/stop-propagation.module.ts b/packages/common/src/lib/stop-propagation/stop-propagation.module.ts index 301ae56e85..73ce4fdff8 100644 --- a/packages/common/src/lib/stop-propagation/stop-propagation.module.ts +++ b/packages/common/src/lib/stop-propagation/stop-propagation.module.ts @@ -1,4 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + import { StopDropPropagationDirective } from './stop-drop-propagation.directive'; import { StopPropagationDirective } from './stop-propagation.directive'; diff --git a/packages/common/src/lib/table/table-datasource.ts b/packages/common/src/lib/table/table-datasource.ts index a55bfb55b4..ca5a864a18 100644 --- a/packages/common/src/lib/table/table-datasource.ts +++ b/packages/common/src/lib/table/table-datasource.ts @@ -1,13 +1,13 @@ import { DataSource } from '@angular/cdk/table'; import { MatSort } from '@angular/material/sort'; -import { Observable, BehaviorSubject, merge } from 'rxjs'; -import { map } from 'rxjs/operators'; - import { ObjectUtils } from '@igo2/utils'; -import { TableModel } from './table-model.interface'; +import { BehaviorSubject, Observable, merge } from 'rxjs'; +import { map } from 'rxjs/operators'; + import { TableDatabase } from './table-database'; +import { TableModel } from './table-model.interface'; export class TableDataSource extends DataSource { get filter(): string { diff --git a/packages/common/src/lib/table/table.component.ts b/packages/common/src/lib/table/table.component.ts index 131bdd276f..75a21e83ae 100644 --- a/packages/common/src/lib/table/table.component.ts +++ b/packages/common/src/lib/table/table.component.ts @@ -1,26 +1,26 @@ +import { SelectionModel } from '@angular/cdk/collections'; import { + AfterViewInit, Component, ElementRef, - ViewChild, + EventEmitter, Input, - Output, OnChanges, OnInit, - AfterViewInit, - EventEmitter + Output, + ViewChild } from '@angular/core'; import { MatSort } from '@angular/material/sort'; -import { SelectionModel } from '@angular/cdk/collections'; - -import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; -import { fromEvent } from 'rxjs'; import { ObjectUtils } from '@igo2/utils'; -import { TableModel } from './table-model.interface'; +import { fromEvent } from 'rxjs'; +import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; + +import { TableActionColor } from './table-action-color.enum'; import { TableDatabase } from './table-database'; import { TableDataSource } from './table-datasource'; -import { TableActionColor } from './table-action-color.enum'; +import { TableModel } from './table-model.interface'; @Component({ selector: 'igo-table', diff --git a/packages/common/src/lib/table/table.module.ts b/packages/common/src/lib/table/table.module.ts index 03f2a3081b..6dacc6be9d 100644 --- a/packages/common/src/lib/table/table.module.ts +++ b/packages/common/src/lib/table/table.module.ts @@ -1,7 +1,7 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { CdkTableModule } from '@angular/cdk/table'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { CdkTableModule } from '@angular/cdk/table'; import { MatButtonModule } from '@angular/material/button'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/packages/common/src/lib/tool/shared/tool.service.spec.ts b/packages/common/src/lib/tool/shared/tool.service.spec.ts index b5d38c1045..d0785c6c96 100644 --- a/packages/common/src/lib/tool/shared/tool.service.spec.ts +++ b/packages/common/src/lib/tool/shared/tool.service.spec.ts @@ -1,5 +1,5 @@ -import { TestBed, inject } from '@angular/core/testing'; import { HttpClientModule } from '@angular/common/http'; +import { TestBed, inject } from '@angular/core/testing'; import { ToolService } from './tool.service'; diff --git a/packages/common/src/lib/tool/shared/toolbox.ts b/packages/common/src/lib/tool/shared/toolbox.ts index f99fd2e84b..276fb717be 100644 --- a/packages/common/src/lib/tool/shared/toolbox.ts +++ b/packages/common/src/lib/tool/shared/toolbox.ts @@ -1,6 +1,7 @@ +import { BehaviorSubject, Subscription } from 'rxjs'; + import { EntityRecord, EntityStore } from '../../entity'; import { Tool, ToolboxOptions } from './tool.interface'; -import { BehaviorSubject, Subscription } from 'rxjs'; /** * Service where all available tools and their component are registered. diff --git a/packages/common/src/lib/tool/tool.module.ts b/packages/common/src/lib/tool/tool.module.ts index 474613873f..4fba97a4b0 100644 --- a/packages/common/src/lib/tool/tool.module.ts +++ b/packages/common/src/lib/tool/tool.module.ts @@ -1,5 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { ToolService } from './shared/tool.service'; import { IgoToolboxModule } from './toolbox/toolbox.module'; diff --git a/packages/common/src/lib/tool/toolbox/toolbox.animation.ts b/packages/common/src/lib/tool/toolbox/toolbox.animation.ts index 80114fbbe0..d47bd3cc7b 100644 --- a/packages/common/src/lib/tool/toolbox/toolbox.animation.ts +++ b/packages/common/src/lib/tool/toolbox/toolbox.animation.ts @@ -1,10 +1,10 @@ import { - trigger, + AnimationTriggerMetadata, + animate, state, style, transition, - animate, - AnimationTriggerMetadata + trigger } from '@angular/animations'; export function toolSlideInOut( diff --git a/packages/common/src/lib/tool/toolbox/toolbox.component.ts b/packages/common/src/lib/tool/toolbox/toolbox.component.ts index c6a53864a4..af862e0c98 100644 --- a/packages/common/src/lib/tool/toolbox/toolbox.component.ts +++ b/packages/common/src/lib/tool/toolbox/toolbox.component.ts @@ -1,19 +1,19 @@ import { + ChangeDetectionStrategy, Component, + HostBinding, Input, OnDestroy, - OnInit, - HostBinding, - ChangeDetectionStrategy + OnInit } from '@angular/core'; -import { Subscription, BehaviorSubject, Observable } from 'rxjs'; +import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; import { Action, ActionStore } from '../../action'; import { Tool } from '../shared/tool.interface'; -import { ToolboxColor } from '../shared/toolbox.enums'; import { Toolbox } from '../shared/toolbox'; +import { ToolboxColor } from '../shared/toolbox.enums'; import { toolSlideInOut } from './toolbox.animation'; @Component({ diff --git a/packages/common/src/lib/tool/toolbox/toolbox.module.ts b/packages/common/src/lib/tool/toolbox/toolbox.module.ts index e1ebe602de..f81b446159 100644 --- a/packages/common/src/lib/tool/toolbox/toolbox.module.ts +++ b/packages/common/src/lib/tool/toolbox/toolbox.module.ts @@ -1,9 +1,8 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { IgoActionModule } from '../../action/action.module'; import { IgoDynamicComponentModule } from '../../dynamic-component/dynamic-component.module'; - import { ToolboxComponent } from './toolbox.component'; /** diff --git a/packages/common/src/lib/widget/shared/widget.service.ts b/packages/common/src/lib/widget/shared/widget.service.ts index 44d07878c1..c91a5242bc 100644 --- a/packages/common/src/lib/widget/shared/widget.service.ts +++ b/packages/common/src/lib/widget/shared/widget.service.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; import { DynamicComponentService } from '../../dynamic-component/shared/dynamic-component.service'; - import { Widget } from './widget'; import { WidgetComponent } from './widget.interfaces'; diff --git a/packages/common/src/lib/widget/widget-outlet/widget-outlet.component.ts b/packages/common/src/lib/widget/widget-outlet/widget-outlet.component.ts index 9374cbf377..e4628f3f52 100644 --- a/packages/common/src/lib/widget/widget-outlet/widget-outlet.component.ts +++ b/packages/common/src/lib/widget/widget-outlet/widget-outlet.component.ts @@ -1,14 +1,13 @@ import { + ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, - ChangeDetectionStrategy, - OnDestroy + Input, + OnDestroy, + Output } from '@angular/core'; import { DynamicComponent } from '../../dynamic-component'; - import { WidgetComponent } from '../shared/widget.interfaces'; /** diff --git a/packages/common/src/lib/widget/widget-outlet/widget-outlet.module.ts b/packages/common/src/lib/widget/widget-outlet/widget-outlet.module.ts index 765a4334ef..5b29800f50 100644 --- a/packages/common/src/lib/widget/widget-outlet/widget-outlet.module.ts +++ b/packages/common/src/lib/widget/widget-outlet/widget-outlet.module.ts @@ -1,8 +1,7 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { IgoDynamicComponentModule } from '../../dynamic-component/dynamic-component.module'; - import { WidgetOutletComponent } from './widget-outlet.component'; /** diff --git a/packages/common/src/lib/widget/widget.module.ts b/packages/common/src/lib/widget/widget.module.ts index 1bbce631c3..b911b08fe1 100644 --- a/packages/common/src/lib/widget/widget.module.ts +++ b/packages/common/src/lib/widget/widget.module.ts @@ -1,8 +1,8 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; -import { IgoWidgetOutletModule } from './widget-outlet/widget-outlet.module'; import { WidgetService } from './shared/widget.service'; +import { IgoWidgetOutletModule } from './widget-outlet/widget-outlet.module'; @NgModule({ imports: [CommonModule, IgoWidgetOutletModule], diff --git a/packages/common/src/lib/workspace/shared/store.ts b/packages/common/src/lib/workspace/shared/store.ts index 25b4fa3750..1d827e87fd 100644 --- a/packages/common/src/lib/workspace/shared/store.ts +++ b/packages/common/src/lib/workspace/shared/store.ts @@ -1,6 +1,7 @@ +import { BehaviorSubject } from 'rxjs'; + import { EntityStore } from '../../entity'; import { Workspace } from './workspace'; -import { BehaviorSubject } from 'rxjs'; /** * The class is a specialized version of an EntityStore that stores diff --git a/packages/common/src/lib/workspace/shared/workspace.ts b/packages/common/src/lib/workspace/shared/workspace.ts index 1fa9a29c3c..bbd1eb46c0 100644 --- a/packages/common/src/lib/workspace/shared/workspace.ts +++ b/packages/common/src/lib/workspace/shared/workspace.ts @@ -1,9 +1,8 @@ -import { Subscription, BehaviorSubject, Subject } from 'rxjs'; +import { BehaviorSubject, Subject, Subscription } from 'rxjs'; import { ActionStore } from '../../action'; -import { Widget } from '../../widget'; import { EntityStoreWithStrategy } from '../../entity'; - +import { Widget } from '../../widget'; import { WorkspaceOptions } from './workspace.interfaces'; /** diff --git a/packages/common/src/lib/workspace/workspace-selector/workspace-selector.component.ts b/packages/common/src/lib/workspace/workspace-selector/workspace-selector.component.ts index 063e62616b..79f7faa3a3 100644 --- a/packages/common/src/lib/workspace/workspace-selector/workspace-selector.component.ts +++ b/packages/common/src/lib/workspace/workspace-selector/workspace-selector.component.ts @@ -1,14 +1,14 @@ import { + ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, - ChangeDetectionStrategy + Input, + Output } from '@angular/core'; import { getEntityTitle } from '../../entity'; -import { Workspace } from '../shared/workspace'; import { WorkspaceStore } from '../shared/store'; +import { Workspace } from '../shared/workspace'; /** * Drop list that activates the selected workspace emit an event. diff --git a/packages/common/src/lib/workspace/workspace-selector/workspace-selector.module.ts b/packages/common/src/lib/workspace/workspace-selector/workspace-selector.module.ts index a8cbaf7299..054d3f4909 100644 --- a/packages/common/src/lib/workspace/workspace-selector/workspace-selector.module.ts +++ b/packages/common/src/lib/workspace/workspace-selector/workspace-selector.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { IgoEntitySelectorModule } from '../../entity/entity-selector/entity-selector.module'; import { WorkspaceSelectorComponent } from './workspace-selector.component'; diff --git a/packages/common/src/lib/workspace/workspace-widget-outlet/workspace-widget-outlet.component.ts b/packages/common/src/lib/workspace/workspace-widget-outlet/workspace-widget-outlet.component.ts index afef142718..ff99eff666 100644 --- a/packages/common/src/lib/workspace/workspace-widget-outlet/workspace-widget-outlet.component.ts +++ b/packages/common/src/lib/workspace/workspace-widget-outlet/workspace-widget-outlet.component.ts @@ -1,9 +1,9 @@ import { + ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, - ChangeDetectionStrategy + Input, + Output } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; diff --git a/packages/common/src/lib/workspace/workspace-widget-outlet/workspace-widget-outlet.module.ts b/packages/common/src/lib/workspace/workspace-widget-outlet/workspace-widget-outlet.module.ts index 1849b1bc48..0abbe72be9 100644 --- a/packages/common/src/lib/workspace/workspace-widget-outlet/workspace-widget-outlet.module.ts +++ b/packages/common/src/lib/workspace/workspace-widget-outlet/workspace-widget-outlet.module.ts @@ -1,8 +1,7 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { IgoWidgetOutletModule } from '../../widget/widget-outlet/widget-outlet.module'; - import { WorkspaceWidgetOutletComponent } from './workspace-widget-outlet.component'; /** diff --git a/packages/common/src/lib/workspace/workspace.module.ts b/packages/common/src/lib/workspace/workspace.module.ts index 0935d535e3..d06b9e9024 100644 --- a/packages/common/src/lib/workspace/workspace.module.ts +++ b/packages/common/src/lib/workspace/workspace.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { IgoWorkspaceSelectorModule } from './workspace-selector/workspace-selector.module'; import { IgoWorkspaceWidgetOutletModule } from './workspace-widget-outlet/workspace-widget-outlet.module'; diff --git a/packages/context/src/lib/context-import-export/context-import-export.module.ts b/packages/context/src/lib/context-import-export/context-import-export.module.ts index 5fab564b62..1f4527b069 100644 --- a/packages/context/src/lib/context-import-export/context-import-export.module.ts +++ b/packages/context/src/lib/context-import-export/context-import-export.module.ts @@ -1,21 +1,21 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { ModuleWithProviders, NgModule } from '@angular/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatOptionModule } from '@angular/material/core'; -import { MatFormFieldModule } from '@angular/material/form-field'; import { MatDividerModule } from '@angular/material/divider'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; -import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatTabsModule } from '@angular/material/tabs'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { IgoSpinnerModule } from '@igo2/common'; import { IgoLanguageModule } from '@igo2/core'; + import { ContextImportExportComponent } from './context-import-export/context-import-export.component'; -import { IgoSpinnerModule } from '@igo2/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @NgModule({ imports: [ diff --git a/packages/context/src/lib/context-import-export/context-import-export/context-import-export.component.ts b/packages/context/src/lib/context-import-export/context-import-export/context-import-export.component.ts index 62bc6b6ddb..cf2bf69e6d 100644 --- a/packages/context/src/lib/context-import-export/context-import-export/context-import-export.component.ts +++ b/packages/context/src/lib/context-import-export/context-import-export/context-import-export.component.ts @@ -1,26 +1,27 @@ -import { Component, Input, OnInit, OnDestroy } from '@angular/core'; +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { - UntypedFormGroup, UntypedFormBuilder, + UntypedFormGroup, Validators } from '@angular/forms'; -import { BehaviorSubject, Subscription } from 'rxjs'; -import { take } from 'rxjs/operators'; -import { MessageService, ConfigService } from '@igo2/core'; +import { ConfigService, MessageService } from '@igo2/core'; import { Layer, VectorLayer } from '@igo2/geo'; import type { IgoMap } from '@igo2/geo'; +import { BehaviorSubject, Subscription } from 'rxjs'; +import { take } from 'rxjs/operators'; + +import { DetailedContext } from '../../context-manager/shared/context.interface'; +import { ContextService } from '../../context-manager/shared/context.service'; +import { ContextExportService } from '../shared/context-export.service'; import { handleFileExportError } from '../shared/context-export.utils'; -import { - handleFileImportSuccess, - handleFileImportError -} from '../shared/context-import.utils'; import { handleFileExportSuccess } from '../shared/context-export.utils'; -import { ContextService } from '../../context-manager/shared/context.service'; import { ContextImportService } from '../shared/context-import.service'; -import { ContextExportService } from '../shared/context-export.service'; -import { DetailedContext } from '../../context-manager/shared/context.interface'; +import { + handleFileImportError, + handleFileImportSuccess +} from '../shared/context-import.utils'; @Component({ selector: 'igo-context-import-export', diff --git a/packages/context/src/lib/context-import-export/shared/context-export.service.ts b/packages/context/src/lib/context-import-export/shared/context-export.service.ts index 4114056a4d..64785a67d2 100644 --- a/packages/context/src/lib/context-import-export/shared/context-export.service.ts +++ b/packages/context/src/lib/context-import-export/shared/context-export.service.ts @@ -2,9 +2,10 @@ import { Injectable } from '@angular/core'; import { downloadContent } from '@igo2/utils'; +import { Observable, Observer } from 'rxjs'; + import { DetailedContext } from '../../context-manager/shared/context.interface'; import { ExportNothingToExportError } from './context-export.errors'; -import { Observer, Observable } from 'rxjs'; @Injectable({ providedIn: 'root' diff --git a/packages/context/src/lib/context-import-export/shared/context-export.utils.ts b/packages/context/src/lib/context-import-export/shared/context-export.utils.ts index 7acda24f7a..e3659967ec 100644 --- a/packages/context/src/lib/context-import-export/shared/context-export.utils.ts +++ b/packages/context/src/lib/context-import-export/shared/context-export.utils.ts @@ -1,4 +1,5 @@ import { MessageService } from '@igo2/core'; + import { ExportNothingToExportError } from './context-export.errors'; export function handleFileExportError( diff --git a/packages/context/src/lib/context-import-export/shared/context-import.service.ts b/packages/context/src/lib/context-import-export/shared/context-import.service.ts index 82c7dabbf2..92ed599294 100644 --- a/packages/context/src/lib/context-import-export/shared/context-import.service.ts +++ b/packages/context/src/lib/context-import-export/shared/context-import.service.ts @@ -1,14 +1,16 @@ import { Injectable } from '@angular/core'; -import { Observable, Observer } from 'rxjs'; + import { ConfigService } from '@igo2/core'; +import { Observable, Observer } from 'rxjs'; + +import { DetailedContext } from '../../context-manager/shared/context.interface'; import { ImportInvalidFileError, - ImportUnreadableFileError, - ImportSizeError + ImportSizeError, + ImportUnreadableFileError } from './context-import.errors'; import { getFileExtension } from './context-import.utils'; -import { DetailedContext } from '../../context-manager/shared/context.interface'; @Injectable({ providedIn: 'root' diff --git a/packages/context/src/lib/context-import-export/shared/context-import.utils.ts b/packages/context/src/lib/context-import-export/shared/context-import.utils.ts index 1ba7d2aabc..a8cc7973b3 100644 --- a/packages/context/src/lib/context-import-export/shared/context-import.utils.ts +++ b/packages/context/src/lib/context-import-export/shared/context-import.utils.ts @@ -1,28 +1,29 @@ -import type { default as OlGeometry } from 'ol/geom/Geometry'; - +import { MessageService } from '@igo2/core'; import { + ClusterDataSource, + ClusterDataSourceOptions, + ClusterParam, FeatureDataSource, FeatureDataSourceOptions, IgoMap, - VectorLayer, QueryableDataSourceOptions, - StyleService, - StyleListService, StyleByAttribute, - ClusterParam, - ClusterDataSourceOptions, - ClusterDataSource, + StyleListService, + StyleService, + VectorLayer, featureRandomStyle, featureRandomStyleFunction } from '@igo2/geo'; -import { MessageService } from '@igo2/core'; + +import OlFeature from 'ol/Feature'; +import GeoJSON from 'ol/format/GeoJSON'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; + import { DetailedContext, ExtraFeatures } from '../../context-manager/shared/context.interface'; import { ContextService } from '../../context-manager/shared/context.service'; -import OlFeature from 'ol/Feature'; -import GeoJSON from 'ol/format/GeoJSON'; export function handleFileImportSuccess( file: File, diff --git a/packages/context/src/lib/context-manager/context-edit/context-edit-binding.directive.ts b/packages/context/src/lib/context-manager/context-edit/context-edit-binding.directive.ts index 5384103b7c..51763fe998 100644 --- a/packages/context/src/lib/context-manager/context-edit/context-edit-binding.directive.ts +++ b/packages/context/src/lib/context-manager/context-edit/context-edit-binding.directive.ts @@ -1,16 +1,17 @@ import { - Output, - EventEmitter, Directive, - Self, - OnInit, + EventEmitter, + HostListener, OnDestroy, - HostListener + OnInit, + Output, + Self } from '@angular/core'; -import { Subscription } from 'rxjs'; import { MessageService } from '@igo2/core'; +import { Subscription } from 'rxjs'; + import { Context, DetailedContext } from '../shared/context.interface'; import { ContextService } from '../shared/context.service'; import { ContextEditComponent } from './context-edit.component'; diff --git a/packages/context/src/lib/context-manager/context-edit/context-edit.component.ts b/packages/context/src/lib/context-manager/context-edit/context-edit.component.ts index 04dab1e481..042a272765 100644 --- a/packages/context/src/lib/context-manager/context-edit/context-edit.component.ts +++ b/packages/context/src/lib/context-manager/context-edit/context-edit.component.ts @@ -1,9 +1,9 @@ import { + ChangeDetectorRef, Component, - Input, - Output, EventEmitter, - ChangeDetectorRef + Input, + Output } from '@angular/core'; import { Context } from '../shared/context.interface'; diff --git a/packages/context/src/lib/context-manager/context-form/context-form.component.ts b/packages/context/src/lib/context-manager/context-form/context-form.component.ts index cf1e50c167..e6c203c656 100644 --- a/packages/context/src/lib/context-manager/context-form/context-form.component.ts +++ b/packages/context/src/lib/context-manager/context-form/context-form.component.ts @@ -1,8 +1,9 @@ -import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; -import { ObjectUtils, Clipboard } from '@igo2/utils'; import { MessageService } from '@igo2/core'; +import { Clipboard, ObjectUtils } from '@igo2/utils'; + import { Context } from '../shared/context.interface'; @Component({ diff --git a/packages/context/src/lib/context-manager/context-item/context-item.component.ts b/packages/context/src/lib/context-manager/context-item/context-item.component.ts index 878a0dda99..154f32f49e 100644 --- a/packages/context/src/lib/context-manager/context-item/context-item.component.ts +++ b/packages/context/src/lib/context-manager/context-item/context-item.component.ts @@ -1,13 +1,14 @@ import { + ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, - ChangeDetectionStrategy + Input, + Output } from '@angular/core'; -import { StorageService } from '@igo2/core'; import { AuthService } from '@igo2/auth'; +import { StorageService } from '@igo2/core'; + import { TypePermission } from '../shared/context.enum'; import { DetailedContext } from '../shared/context.interface'; diff --git a/packages/context/src/lib/context-manager/context-list/context-list-binding.directive.ts b/packages/context/src/lib/context-manager/context-list/context-list-binding.directive.ts index b37c1ba57a..482bc4381e 100644 --- a/packages/context/src/lib/context-manager/context-list/context-list-binding.directive.ts +++ b/packages/context/src/lib/context-manager/context-list/context-list-binding.directive.ts @@ -1,24 +1,25 @@ import { + ChangeDetectorRef, Directive, - Self, - OnInit, - OnDestroy, HostListener, - ChangeDetectorRef + OnDestroy, + OnInit, + Self } from '@angular/core'; -import { Subscription } from 'rxjs'; -import { debounceTime } from 'rxjs/operators'; -import { MessageService, LanguageService, StorageService } from '@igo2/core'; import { AuthService } from '@igo2/auth'; import { ConfirmDialogService } from '@igo2/common'; +import { LanguageService, MessageService, StorageService } from '@igo2/core'; import { MapService } from '@igo2/geo'; +import { Subscription } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; + import { Context, - DetailedContext, + ContextUserPermission, ContextsList, - ContextUserPermission + DetailedContext } from '../shared/context.interface'; import { ContextService } from '../shared/context.service'; import { ContextListComponent } from './context-list.component'; diff --git a/packages/context/src/lib/context-manager/context-list/context-list.component.ts b/packages/context/src/lib/context-manager/context-list/context-list.component.ts index 3f81cb0654..b3f6cd4dba 100644 --- a/packages/context/src/lib/context-manager/context-list/context-list.component.ts +++ b/packages/context/src/lib/context-manager/context-list/context-list.component.ts @@ -1,38 +1,38 @@ import { + ChangeDetectionStrategy, + ChangeDetectorRef, Component, - Input, - Output, EventEmitter, - ChangeDetectorRef, + Input, + OnDestroy, OnInit, - ChangeDetectionStrategy, - OnDestroy + Output } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { AuthService } from '@igo2/auth'; +import { ActionStore, ActionbarMode } from '@igo2/common'; import { ConfigService, LanguageService, StorageService } from '@igo2/core'; import type { IgoMap } from '@igo2/geo'; import { - DetailedContext, - ContextsList, - ContextUserPermission, - ContextProfils -} from '../shared/context.interface'; -import { ContextListControlsEnum } from './context-list.enum'; -import { - Subscription, BehaviorSubject, - ReplaySubject, EMPTY, + ReplaySubject, + Subscription, timer } from 'rxjs'; import { take } from 'rxjs/operators'; +import { debounce } from 'rxjs/operators'; -import { MatDialog } from '@angular/material/dialog'; import { BookmarkDialogComponent } from '../../context-map-button/bookmark-button/bookmark-dialog.component'; -import { debounce } from 'rxjs/operators'; -import { ActionStore, ActionbarMode } from '@igo2/common'; +import { + ContextProfils, + ContextUserPermission, + ContextsList, + DetailedContext +} from '../shared/context.interface'; +import { ContextListControlsEnum } from './context-list.enum'; @Component({ selector: 'igo-context-list', diff --git a/packages/context/src/lib/context-manager/context-manager.module.ts b/packages/context/src/lib/context-manager/context-manager.module.ts index ba7bbc4e14..d050a2998f 100644 --- a/packages/context/src/lib/context-manager/context-manager.module.ts +++ b/packages/context/src/lib/context-manager/context-manager.module.ts @@ -1,5 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatButtonModule } from '@angular/material/button'; @@ -15,27 +15,27 @@ import { MatRadioModule } from '@angular/material/radio'; import { MatTooltipModule } from '@angular/material/tooltip'; import { IgoAuthModule } from '@igo2/auth'; -import { IgoLanguageModule } from '@igo2/core'; import { - IgoListModule, - IgoKeyValueModule, + IgoActionbarModule, IgoCollapsibleModule, - IgoStopPropagationModule, - IgoActionbarModule + IgoKeyValueModule, + IgoListModule, + IgoStopPropagationModule } from '@igo2/common'; +import { IgoLanguageModule } from '@igo2/core'; -import { MapContextDirective } from './shared/map-context.directive'; -import { LayerContextDirective } from './shared/layer-context.directive'; -import { ContextListComponent } from './context-list/context-list.component'; -import { ContextListBindingDirective } from './context-list/context-list-binding.directive'; -import { ContextItemComponent } from './context-item/context-item.component'; -import { ContextFormComponent } from './context-form/context-form.component'; -import { ContextEditComponent } from './context-edit/context-edit.component'; +import { IgoContextImportExportModule } from '../context-import-export/context-import-export.module'; +import { IgoContextMapButtonModule } from '../context-map-button/context-map-button.module'; import { ContextEditBindingDirective } from './context-edit/context-edit-binding.directive'; -import { ContextPermissionsComponent } from './context-permissions/context-permissions.component'; +import { ContextEditComponent } from './context-edit/context-edit.component'; +import { ContextFormComponent } from './context-form/context-form.component'; +import { ContextItemComponent } from './context-item/context-item.component'; +import { ContextListBindingDirective } from './context-list/context-list-binding.directive'; +import { ContextListComponent } from './context-list/context-list.component'; import { ContextPermissionsBindingDirective } from './context-permissions/context-permissions-binding.directive'; -import { IgoContextMapButtonModule } from '../context-map-button/context-map-button.module'; -import { IgoContextImportExportModule } from '../context-import-export/context-import-export.module'; +import { ContextPermissionsComponent } from './context-permissions/context-permissions.component'; +import { LayerContextDirective } from './shared/layer-context.directive'; +import { MapContextDirective } from './shared/map-context.directive'; const CONTEXT_DIRECTIVES = [MapContextDirective, LayerContextDirective]; diff --git a/packages/context/src/lib/context-manager/context-permissions/context-permissions-binding.directive.ts b/packages/context/src/lib/context-manager/context-permissions/context-permissions-binding.directive.ts index eb51131015..a74f9a6596 100644 --- a/packages/context/src/lib/context-manager/context-permissions/context-permissions-binding.directive.ts +++ b/packages/context/src/lib/context-manager/context-permissions/context-permissions-binding.directive.ts @@ -1,14 +1,15 @@ import { + ChangeDetectorRef, Directive, - Self, - OnInit, - OnDestroy, HostListener, - ChangeDetectorRef + OnDestroy, + OnInit, + Self } from '@angular/core'; -import { Subscription } from 'rxjs'; -import { MessageService, LanguageService } from '@igo2/core'; +import { LanguageService, MessageService } from '@igo2/core'; + +import { Subscription } from 'rxjs'; import { Context, diff --git a/packages/context/src/lib/context-manager/context-permissions/context-permissions.component.ts b/packages/context/src/lib/context-manager/context-permissions/context-permissions.component.ts index d46f9175bb..273845018d 100644 --- a/packages/context/src/lib/context-manager/context-permissions/context-permissions.component.ts +++ b/packages/context/src/lib/context-manager/context-permissions/context-permissions.component.ts @@ -1,30 +1,30 @@ +import { HttpClient } from '@angular/common/http'; import { + ChangeDetectorRef, Component, - Input, - Output, EventEmitter, + Input, OnInit, - ChangeDetectorRef + Output } from '@angular/core'; import { UntypedFormBuilder, - UntypedFormGroup, - UntypedFormControl + UntypedFormControl, + UntypedFormGroup } from '@angular/forms'; +import { AuthService } from '@igo2/auth'; +import { ConfigService } from '@igo2/core'; + +import { Subscription } from 'rxjs'; + +import { TypePermission } from '../shared/context.enum'; import { Context, ContextPermission, ContextPermissionsList, ContextProfils } from '../shared/context.interface'; -import { TypePermission } from '../shared/context.enum'; - -import { HttpClient } from '@angular/common/http'; -import { Subscription } from 'rxjs'; - -import { AuthService } from '@igo2/auth'; -import { ConfigService } from '@igo2/core'; @Component({ selector: 'igo-context-permissions', diff --git a/packages/context/src/lib/context-manager/shared/context.interface.ts b/packages/context/src/lib/context-manager/shared/context.interface.ts index 5dbdaca930..1bb43f58f3 100644 --- a/packages/context/src/lib/context-manager/shared/context.interface.ts +++ b/packages/context/src/lib/context-manager/shared/context.interface.ts @@ -1,16 +1,17 @@ -import { Message } from '@igo2/core'; import { Tool } from '@igo2/common'; +import { Message } from '@igo2/core'; import { - MapViewOptions, LayerOptions, - MapScaleLineOptions, MapAttributionOptions, - MapExtent + MapExtent, + MapScaleLineOptions, + MapViewOptions } from '@igo2/geo'; -import { TypePermission } from './context.enum'; import { FeatureCollection } from 'geojson'; +import { TypePermission } from './context.enum'; + export interface Context { id?: string; title?: string; diff --git a/packages/context/src/lib/context-manager/shared/context.service.ts b/packages/context/src/lib/context-manager/shared/context.service.ts index 3fbdd36d12..b85ba573a4 100644 --- a/packages/context/src/lib/context-manager/shared/context.service.ts +++ b/packages/context/src/lib/context-manager/shared/context.service.ts @@ -1,34 +1,16 @@ -import { Injectable, Optional } from '@angular/core'; import { HttpClient, HttpErrorResponse } from '@angular/common/http'; +import { Injectable, Optional } from '@angular/core'; -import { BehaviorSubject, Observable, of, Subject } from 'rxjs'; -import { - map, - tap, - catchError, - debounceTime, - mergeMap, - first, - skip -} from 'rxjs/operators'; - -import olPoint from 'ol/geom/Point'; -import GeoJSON from 'ol/format/GeoJSON'; -import Cluster from 'ol/source/Cluster'; -import olVectorSource from 'ol/source/Vector'; - +import { AuthService } from '@igo2/auth'; import { Tool } from '@igo2/common'; -import { uuid, ObjectUtils } from '@igo2/utils'; import { ConfigService, - RouteService, + LanguageService, Message, MessageService, - LanguageService, + RouteService, StorageService } from '@igo2/core'; - -import { AuthService } from '@igo2/auth'; import type { IgoMap, Layer, @@ -37,20 +19,37 @@ import type { VectorTileLayerOptions } from '@igo2/geo'; import { ExportService } from '@igo2/geo'; +import { ObjectUtils, uuid } from '@igo2/utils'; + +import GeoJSON from 'ol/format/GeoJSON'; +import { Geometry } from 'ol/geom'; +import olPoint from 'ol/geom/Point'; +import Cluster from 'ol/source/Cluster'; +import olVectorSource from 'ol/source/Vector'; + +import { Feature } from 'ol'; +import { BehaviorSubject, Observable, Subject, of } from 'rxjs'; +import { + catchError, + debounceTime, + first, + map, + mergeMap, + skip, + tap +} from 'rxjs/operators'; import { TypePermission } from './context.enum'; import { - ContextsList, - ContextServiceOptions, Context, - DetailedContext, ContextMapView, ContextPermission, ContextProfils, + ContextServiceOptions, + ContextsList, + DetailedContext, ExtraFeatures } from './context.interface'; -import { Geometry } from 'ol/geom'; -import { Feature } from 'ol'; @Injectable({ providedIn: 'root' diff --git a/packages/context/src/lib/context-manager/shared/layer-context.directive.ts b/packages/context/src/lib/context-manager/shared/layer-context.directive.ts index 278229d3e1..67aac43889 100644 --- a/packages/context/src/lib/context-manager/shared/layer-context.directive.ts +++ b/packages/context/src/lib/context-manager/shared/layer-context.directive.ts @@ -1,26 +1,26 @@ -import { Directive, OnInit, OnDestroy, Optional, Input } from '@angular/core'; +import { Directive, Input, OnDestroy, OnInit, Optional } from '@angular/core'; -import { Subscription, merge } from 'rxjs'; -import { buffer, debounceTime, filter, first } from 'rxjs/operators'; - -import { RouteService, ConfigService } from '@igo2/core'; +import { ConfigService, RouteService } from '@igo2/core'; import { - MapBrowserComponent, Layer, - LayerService, LayerOptions, + LayerService, + MapBrowserComponent, StyleListService, StyleService } from '@igo2/geo'; import type { IgoMap } from '@igo2/geo'; import { ObjectUtils } from '@igo2/utils'; -import { ContextService } from './context.service'; -import { DetailedContext } from './context.interface'; +import { Subscription, merge } from 'rxjs'; +import { buffer, debounceTime, filter, first } from 'rxjs/operators'; + import { - addImportedFeaturesToMap, - addImportedFeaturesStyledToMap + addImportedFeaturesStyledToMap, + addImportedFeaturesToMap } from '../../context-import-export/shared/context-import.utils'; +import { DetailedContext } from './context.interface'; +import { ContextService } from './context.service'; @Directive({ selector: '[igoLayerContext]' diff --git a/packages/context/src/lib/context-manager/shared/map-context.directive.ts b/packages/context/src/lib/context-manager/shared/map-context.directive.ts index af1a389d00..93628b2371 100644 --- a/packages/context/src/lib/context-manager/shared/map-context.directive.ts +++ b/packages/context/src/lib/context-manager/shared/map-context.directive.ts @@ -1,19 +1,19 @@ -import { Directive, OnInit, OnDestroy } from '@angular/core'; - -import { Subscription } from 'rxjs'; -import { filter } from 'rxjs/operators'; +import { Directive, OnDestroy, OnInit } from '@angular/core'; +import { MediaService } from '@igo2/core'; import { - MapViewOptions, MapBrowserComponent, MapControlsOptions, - MapScaleLineOptions + MapScaleLineOptions, + MapViewOptions } from '@igo2/geo'; import type { IgoMap } from '@igo2/geo'; +import { Subscription } from 'rxjs'; +import { filter } from 'rxjs/operators'; + +import { ContextMapView, DetailedContext } from './context.interface'; import { ContextService } from './context.service'; -import { DetailedContext, ContextMapView } from './context.interface'; -import { MediaService } from '@igo2/core'; @Directive({ selector: '[igoMapContext]' diff --git a/packages/context/src/lib/context-map-button/bookmark-button/bookmark-button.component.ts b/packages/context/src/lib/context-map-button/bookmark-button/bookmark-button.component.ts index 3e8539673e..5b86a9ac5e 100644 --- a/packages/context/src/lib/context-map-button/bookmark-button/bookmark-button.component.ts +++ b/packages/context/src/lib/context-map-button/bookmark-button/bookmark-button.component.ts @@ -1,10 +1,11 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { take } from 'rxjs/operators'; import { MessageService } from '@igo2/core'; import type { IgoMap } from '@igo2/geo'; +import { take } from 'rxjs/operators'; + import { ContextService } from '../../context-manager/shared/context.service'; import { BookmarkDialogComponent } from './bookmark-dialog.component'; diff --git a/packages/context/src/lib/context-map-button/context-map-button.module.ts b/packages/context/src/lib/context-map-button/context-map-button.module.ts index 823afa1ace..7f438b4e7a 100644 --- a/packages/context/src/lib/context-map-button/context-map-button.module.ts +++ b/packages/context/src/lib/context-map-button/context-map-button.module.ts @@ -1,7 +1,6 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; - import { MatButtonModule } from '@angular/material/button'; import { MatOptionModule } from '@angular/material/core'; import { MatDialogModule } from '@angular/material/dialog'; @@ -11,17 +10,17 @@ import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { IgoLanguageModule } from '@igo2/core'; -import { IgoConfirmDialogModule, IgoStopPropagationModule } from '@igo2/common'; import { IgoAuthModule } from '@igo2/auth'; +import { IgoConfirmDialogModule, IgoStopPropagationModule } from '@igo2/common'; +import { IgoLanguageModule } from '@igo2/core'; import { BookmarkButtonComponent } from './bookmark-button/bookmark-button.component'; import { BookmarkDialogComponent } from './bookmark-button/bookmark-dialog.component'; import { PoiButtonComponent } from './poi-button/poi-button.component'; import { PoiDialogComponent } from './poi-button/poi-dialog.component'; import { PoiService } from './poi-button/shared/poi.service'; -import { UserDialogComponent } from './user-button/user-dialog.component'; import { UserButtonComponent } from './user-button/user-button.component'; +import { UserDialogComponent } from './user-button/user-dialog.component'; @NgModule({ imports: [ diff --git a/packages/context/src/lib/context-map-button/poi-button/poi-button.component.ts b/packages/context/src/lib/context-map-button/poi-button/poi-button.component.ts index ba855c6c8d..5d8c51b9ef 100644 --- a/packages/context/src/lib/context-map-button/poi-button/poi-button.component.ts +++ b/packages/context/src/lib/context-map-button/poi-button/poi-button.component.ts @@ -1,20 +1,21 @@ -import { Component, Input, OnInit, OnDestroy } from '@angular/core'; +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { Subscription } from 'rxjs'; -import { take } from 'rxjs/operators'; -import * as olproj from 'ol/proj'; +import { AuthService } from '@igo2/auth'; +import { ConfirmDialogService } from '@igo2/common'; +import { LanguageService, MessageService } from '@igo2/core'; +import type { IgoMap } from '@igo2/geo'; + import * as oleasing from 'ol/easing'; import olPoint from 'ol/geom/Point'; +import * as olproj from 'ol/proj'; -import { MessageService, LanguageService } from '@igo2/core'; -import { ConfirmDialogService } from '@igo2/common'; -import { AuthService } from '@igo2/auth'; -import type { IgoMap } from '@igo2/geo'; +import { Subscription } from 'rxjs'; +import { take } from 'rxjs/operators'; -import { PoiService } from './shared/poi.service'; -import { Poi } from './shared/poi.interface'; import { PoiDialogComponent } from './poi-dialog.component'; +import { Poi } from './shared/poi.interface'; +import { PoiService } from './shared/poi.service'; @Component({ selector: 'igo-poi-button', diff --git a/packages/context/src/lib/context-map-button/poi-button/shared/poi.service.ts b/packages/context/src/lib/context-map-button/poi-button/shared/poi.service.ts index a82814b6e2..be50b8a6df 100644 --- a/packages/context/src/lib/context-map-button/poi-button/shared/poi.service.ts +++ b/packages/context/src/lib/context-map-button/poi-button/shared/poi.service.ts @@ -1,8 +1,10 @@ -import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Observable, EMPTY } from 'rxjs'; +import { Injectable } from '@angular/core'; import { ConfigService } from '@igo2/core'; + +import { EMPTY, Observable } from 'rxjs'; + import { Poi } from './poi.interface'; @Injectable() diff --git a/packages/context/src/lib/context-map-button/user-button/user-button.animation.ts b/packages/context/src/lib/context-map-button/user-button/user-button.animation.ts index a8738d4e38..35f78dc7a9 100644 --- a/packages/context/src/lib/context-map-button/user-button/user-button.animation.ts +++ b/packages/context/src/lib/context-map-button/user-button/user-button.animation.ts @@ -1,10 +1,10 @@ import { - trigger, + AnimationTriggerMetadata, + animate, state, style, transition, - animate, - AnimationTriggerMetadata + trigger } from '@angular/animations'; export function userButtonSlideInOut(): AnimationTriggerMetadata { diff --git a/packages/context/src/lib/context-map-button/user-button/user-button.component.ts b/packages/context/src/lib/context-map-button/user-button/user-button.component.ts index fdcd8f5298..095a51185c 100644 --- a/packages/context/src/lib/context-map-button/user-button/user-button.component.ts +++ b/packages/context/src/lib/context-map-button/user-button/user-button.component.ts @@ -1,12 +1,12 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { ConfigService } from '@igo2/core'; import { AuthService } from '@igo2/auth'; +import { ConfigService } from '@igo2/core'; import type { IgoMap } from '@igo2/geo'; -import { UserDialogComponent } from './user-dialog.component'; import { userButtonSlideInOut } from './user-button.animation'; +import { UserDialogComponent } from './user-dialog.component'; @Component({ selector: 'igo-user-button', diff --git a/packages/context/src/lib/context-map-button/user-button/user-dialog.component.ts b/packages/context/src/lib/context-map-button/user-button/user-dialog.component.ts index eb938e344f..77fd2fe5f2 100644 --- a/packages/context/src/lib/context-map-button/user-button/user-dialog.component.ts +++ b/packages/context/src/lib/context-map-button/user-button/user-dialog.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { StorageService } from '@igo2/core'; import { AuthService } from '@igo2/auth'; +import { StorageService } from '@igo2/core'; @Component({ selector: 'igo-user-dialog', diff --git a/packages/context/src/lib/context.module.ts b/packages/context/src/lib/context.module.ts index beb0307e41..4f3fa288a3 100644 --- a/packages/context/src/lib/context.module.ts +++ b/packages/context/src/lib/context.module.ts @@ -1,4 +1,4 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; diff --git a/packages/context/src/lib/share-map/share-map.module.ts b/packages/context/src/lib/share-map/share-map.module.ts index 2762b6d7e6..2c25a4523a 100644 --- a/packages/context/src/lib/share-map/share-map.module.ts +++ b/packages/context/src/lib/share-map/share-map.module.ts @@ -1,19 +1,19 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatTooltipModule } from '@angular/material/tooltip'; import { MatTabsModule } from '@angular/material/tabs'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { IgoCustomHtmlModule } from '@igo2/common'; import { IgoLanguageModule } from '@igo2/core'; -import { ShareMapComponent } from './share-map/share-map.component'; -import { ShareMapUrlComponent } from './share-map/share-map-url.component'; import { ShareMapApiComponent } from './share-map/share-map-api.component'; -import { IgoCustomHtmlModule } from '@igo2/common'; +import { ShareMapUrlComponent } from './share-map/share-map-url.component'; +import { ShareMapComponent } from './share-map/share-map.component'; @NgModule({ imports: [ diff --git a/packages/context/src/lib/share-map/share-map/share-map-api.component.ts b/packages/context/src/lib/share-map/share-map/share-map-api.component.ts index b36ccb886f..23db048396 100644 --- a/packages/context/src/lib/share-map/share-map/share-map-api.component.ts +++ b/packages/context/src/lib/share-map/share-map/share-map-api.component.ts @@ -1,10 +1,10 @@ import { Component, Input, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; -import { uuid, Clipboard } from '@igo2/utils'; -import { MessageService, LanguageService } from '@igo2/core'; import { AuthService } from '@igo2/auth'; +import { LanguageService, MessageService } from '@igo2/core'; import type { IgoMap } from '@igo2/geo'; +import { Clipboard, uuid } from '@igo2/utils'; import { ShareMapService } from '../shared/share-map.service'; diff --git a/packages/context/src/lib/share-map/share-map/share-map-url.component.ts b/packages/context/src/lib/share-map/share-map/share-map-url.component.ts index e2ecc9dabb..1f939af1f9 100644 --- a/packages/context/src/lib/share-map/share-map/share-map-url.component.ts +++ b/packages/context/src/lib/share-map/share-map/share-map-url.component.ts @@ -1,18 +1,19 @@ import { AfterViewInit, + ChangeDetectorRef, Component, Input, - OnInit, - ChangeDetectorRef, - OnDestroy + OnDestroy, + OnInit } from '@angular/core'; -import { Clipboard } from '@igo2/utils'; import { MessageService } from '@igo2/core'; import type { IgoMap } from '@igo2/geo'; +import { Clipboard } from '@igo2/utils'; + +import { Subscription, combineLatest } from 'rxjs'; import { ShareMapService } from '../shared/share-map.service'; -import { combineLatest, Subscription } from 'rxjs'; @Component({ selector: 'igo-share-map-url', diff --git a/packages/context/src/lib/sidenav/sidenav.component.ts b/packages/context/src/lib/sidenav/sidenav.component.ts index a0e9a071b2..c7b4151f16 100644 --- a/packages/context/src/lib/sidenav/sidenav.component.ts +++ b/packages/context/src/lib/sidenav/sidenav.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { Title } from '@angular/platform-browser'; -import type { Media } from '@igo2/core'; import { FlexibleState, Tool, getEntityTitle } from '@igo2/common'; +import type { Media } from '@igo2/core'; import { Feature, FeatureMotion, moveToOlFeatures } from '@igo2/geo'; import type { IgoMap } from '@igo2/geo'; diff --git a/packages/context/src/lib/sidenav/sidenav.module.ts b/packages/context/src/lib/sidenav/sidenav.module.ts index a5d28f2b9d..2ad31f21f4 100644 --- a/packages/context/src/lib/sidenav/sidenav.module.ts +++ b/packages/context/src/lib/sidenav/sidenav.module.ts @@ -1,12 +1,12 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatSidenavModule } from '@angular/material/sidenav'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { IgoFlexibleModule, IgoPanelModule } from '@igo2/common'; import { IgoLanguageModule } from '@igo2/core'; -import { IgoPanelModule, IgoFlexibleModule } from '@igo2/common'; import { IgoFeatureModule } from '@igo2/geo'; import { IgoContextManagerModule } from '../context-manager/context-manager.module'; diff --git a/packages/core/src/lib/activity/activity.interceptor.ts b/packages/core/src/lib/activity/activity.interceptor.ts index 26690ec2ff..02ada6f055 100644 --- a/packages/core/src/lib/activity/activity.interceptor.ts +++ b/packages/core/src/lib/activity/activity.interceptor.ts @@ -1,10 +1,10 @@ -import { Injectable } from '@angular/core'; import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'; +import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { finalize } from 'rxjs/operators'; diff --git a/packages/core/src/lib/activity/activity.module.ts b/packages/core/src/lib/activity/activity.module.ts index c58c362046..c261e3362a 100644 --- a/packages/core/src/lib/activity/activity.module.ts +++ b/packages/core/src/lib/activity/activity.module.ts @@ -1,5 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { ActivityInterceptor } from './activity.interceptor'; diff --git a/packages/core/src/lib/activity/activity.service.ts b/packages/core/src/lib/activity/activity.service.ts index 1d21a9764c..ed03fc076b 100644 --- a/packages/core/src/lib/activity/activity.service.ts +++ b/packages/core/src/lib/activity/activity.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; - import { uuid } from '@igo2/utils'; +import { BehaviorSubject } from 'rxjs'; + @Injectable({ providedIn: 'root' }) diff --git a/packages/core/src/lib/analytics/shared/analytics.service.ts b/packages/core/src/lib/analytics/shared/analytics.service.ts index a28c5c5630..f8b6cf398f 100644 --- a/packages/core/src/lib/analytics/shared/analytics.service.ts +++ b/packages/core/src/lib/analytics/shared/analytics.service.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; import { ConfigService } from '../../config/config.service'; - import { AnalyticsOptions } from './analytics.interface'; @Injectable({ diff --git a/packages/core/src/lib/compression/compression.service.ts b/packages/core/src/lib/compression/compression.service.ts index 345f555228..8cb4f08968 100644 --- a/packages/core/src/lib/compression/compression.service.ts +++ b/packages/core/src/lib/compression/compression.service.ts @@ -1,5 +1,7 @@ import { Injectable } from '@angular/core'; + import { Observable, Observer } from 'rxjs'; + import { CompressedData } from './compressedData.interface'; function getNumber(v: number, endposition: number, length: number) { diff --git a/packages/core/src/lib/config/config-deprecated.ts b/packages/core/src/lib/config/config-deprecated.ts index 4725b41c65..47a93e75fb 100644 --- a/packages/core/src/lib/config/config-deprecated.ts +++ b/packages/core/src/lib/config/config-deprecated.ts @@ -1,4 +1,4 @@ -import { DeprecatedOptions, AlternateConfigOptions } from './config.interface'; +import { AlternateConfigOptions, DeprecatedOptions } from './config.interface'; export const CONFIG_DEPRECATED: { [key: string]: DeprecatedOptions } = { showMenuButton: { diff --git a/packages/core/src/lib/config/config.module.ts b/packages/core/src/lib/config/config.module.ts index 058c7c7989..55e6b23329 100644 --- a/packages/core/src/lib/config/config.module.ts +++ b/packages/core/src/lib/config/config.module.ts @@ -1,5 +1,6 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; -import { provideConfigOptions, provideConfigLoader } from './config.provider'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + +import { provideConfigLoader, provideConfigOptions } from './config.provider'; @NgModule({ imports: [], diff --git a/packages/core/src/lib/config/config.provider.ts b/packages/core/src/lib/config/config.provider.ts index fc797ce18c..9f087ce60d 100644 --- a/packages/core/src/lib/config/config.provider.ts +++ b/packages/core/src/lib/config/config.provider.ts @@ -1,7 +1,7 @@ import { APP_INITIALIZER, InjectionToken } from '@angular/core'; -import { ConfigService } from './config.service'; import { ConfigOptions } from './config.interface'; +import { ConfigService } from './config.service'; export let CONFIG_OPTIONS = new InjectionToken('configOptions'); diff --git a/packages/core/src/lib/config/config.service.spec.ts b/packages/core/src/lib/config/config.service.spec.ts index 63567ea57c..0a3086f8a5 100644 --- a/packages/core/src/lib/config/config.service.spec.ts +++ b/packages/core/src/lib/config/config.service.spec.ts @@ -1,5 +1,5 @@ -import { TestBed, inject } from '@angular/core/testing'; import { HttpClientModule } from '@angular/common/http'; +import { TestBed, inject } from '@angular/core/testing'; import { ConfigService } from './config.service'; diff --git a/packages/core/src/lib/config/config.service.ts b/packages/core/src/lib/config/config.service.ts index 26f46a57c3..061aef849a 100644 --- a/packages/core/src/lib/config/config.service.ts +++ b/packages/core/src/lib/config/config.service.ts @@ -1,16 +1,17 @@ -import { Injectable } from '@angular/core'; import { HttpBackend, HttpClient } from '@angular/common/http'; -import { throwError } from 'rxjs'; -import { catchError } from 'rxjs/operators'; +import { Injectable } from '@angular/core'; import { ObjectUtils } from '@igo2/utils'; -import { ConfigOptions } from './config.interface'; -import { version } from './version'; +import { throwError } from 'rxjs'; +import { catchError } from 'rxjs/operators'; + import { ALTERNATE_CONFIG_FROM_DEPRECATION, CONFIG_DEPRECATED } from './config-deprecated'; +import { ConfigOptions } from './config.interface'; +import { version } from './version'; @Injectable({ providedIn: 'root' diff --git a/packages/core/src/lib/core.module.ts b/packages/core/src/lib/core.module.ts index aa291a9c0d..06fa5b161c 100644 --- a/packages/core/src/lib/core.module.ts +++ b/packages/core/src/lib/core.module.ts @@ -1,15 +1,16 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; import { HttpClientModule } from '@angular/common/http'; -import { DomSanitizer } from '@angular/platform-browser'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatIconRegistry } from '@angular/material/icon'; +import { DomSanitizer } from '@angular/platform-browser'; + +import { DBConfig, NgxIndexedDBModule } from 'ngx-indexed-db'; import { IgoActivityModule } from './activity/activity.module'; import { IgoConfigModule } from './config/config.module'; import { IgoLanguageModule } from './language/language.module'; import { IgoMessageModule } from './message/message.module'; import { IgoErrorModule } from './request/error.module'; -import { DBConfig, NgxIndexedDBModule } from 'ngx-indexed-db'; const dbConfig: DBConfig = { name: 'igo2DB', diff --git a/packages/core/src/lib/gesture/gesture.module.ts b/packages/core/src/lib/gesture/gesture.module.ts index 0a8104bca8..157993df84 100644 --- a/packages/core/src/lib/gesture/gesture.module.ts +++ b/packages/core/src/lib/gesture/gesture.module.ts @@ -1,5 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; -import { HammerModule, HAMMER_GESTURE_CONFIG } from '@angular/platform-browser'; +import { ModuleWithProviders, NgModule } from '@angular/core'; +import { HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser'; import { IgoGestureConfig } from './gesture.provider'; diff --git a/packages/core/src/lib/language/language.module.ts b/packages/core/src/lib/language/language.module.ts index d2dffa0eff..38ef06de89 100644 --- a/packages/core/src/lib/language/language.module.ts +++ b/packages/core/src/lib/language/language.module.ts @@ -1,7 +1,8 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + import { - TranslateModule, - MissingTranslationHandler + MissingTranslationHandler, + TranslateModule } from '@ngx-translate/core'; import { provideDefaultLanguageLoader } from './shared/language.provider'; diff --git a/packages/core/src/lib/language/shared/language.loader.ts b/packages/core/src/lib/language/shared/language.loader.ts index b0dc09b3ae..f200bd5079 100644 --- a/packages/core/src/lib/language/shared/language.loader.ts +++ b/packages/core/src/lib/language/shared/language.loader.ts @@ -1,10 +1,9 @@ import { HttpBackend, HttpClient } from '@angular/common/http'; -import { forkJoin, map } from 'rxjs'; +import { ObjectUtils } from '@igo2/utils'; import { TranslateLoader } from '@ngx-translate/core'; - -import { ObjectUtils } from '@igo2/utils'; +import { forkJoin, map } from 'rxjs'; import { ConfigService } from '../../config/config.service'; diff --git a/packages/core/src/lib/language/shared/language.provider.ts b/packages/core/src/lib/language/shared/language.provider.ts index f1c689be1e..908d44fea8 100644 --- a/packages/core/src/lib/language/shared/language.provider.ts +++ b/packages/core/src/lib/language/shared/language.provider.ts @@ -1,4 +1,5 @@ import { HttpBackend } from '@angular/common/http'; + import { TranslateLoader } from '@ngx-translate/core'; import { ConfigService } from '../../config/config.service'; diff --git a/packages/core/src/lib/language/shared/language.service.spec.ts b/packages/core/src/lib/language/shared/language.service.spec.ts index b078023f4c..93e01cd912 100644 --- a/packages/core/src/lib/language/shared/language.service.spec.ts +++ b/packages/core/src/lib/language/shared/language.service.spec.ts @@ -1,5 +1,5 @@ -import { TestBed, inject } from '@angular/core/testing'; import { HttpClientModule } from '@angular/common/http'; +import { TestBed, inject } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/packages/core/src/lib/language/shared/language.service.ts b/packages/core/src/lib/language/shared/language.service.ts index 48569ab86e..388536a7f9 100644 --- a/packages/core/src/lib/language/shared/language.service.ts +++ b/packages/core/src/lib/language/shared/language.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; + import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, combineLatest } from 'rxjs'; diff --git a/packages/core/src/lib/media/media.service.ts b/packages/core/src/lib/media/media.service.ts index 8def52564f..042a299c9e 100644 --- a/packages/core/src/lib/media/media.service.ts +++ b/packages/core/src/lib/media/media.service.ts @@ -1,5 +1,5 @@ +import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import { Injectable } from '@angular/core'; -import { Breakpoints, BreakpointObserver } from '@angular/cdk/layout'; import { BehaviorSubject } from 'rxjs'; diff --git a/packages/core/src/lib/message/message.module.ts b/packages/core/src/lib/message/message.module.ts index b5e0e29744..708bcda798 100644 --- a/packages/core/src/lib/message/message.module.ts +++ b/packages/core/src/lib/message/message.module.ts @@ -1,5 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { GlobalConfig, ToastrModule } from 'ngx-toastr'; diff --git a/packages/core/src/lib/message/shared/message.interface.ts b/packages/core/src/lib/message/shared/message.interface.ts index c41c1e026b..2610f9ba89 100644 --- a/packages/core/src/lib/message/shared/message.interface.ts +++ b/packages/core/src/lib/message/shared/message.interface.ts @@ -1,7 +1,9 @@ import { TemplateRef } from '@angular/core'; -import { MessageType } from './message.enum'; + import { IndividualConfig } from 'ngx-toastr'; +import { MessageType } from './message.enum'; + export interface Message { title?: string; text?: string; diff --git a/packages/core/src/lib/message/shared/message.service.ts b/packages/core/src/lib/message/shared/message.service.ts index a5ced159fe..6999831085 100644 --- a/packages/core/src/lib/message/shared/message.service.ts +++ b/packages/core/src/lib/message/shared/message.service.ts @@ -1,14 +1,14 @@ -import { Injectable, Inject, Injector } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; +import { Inject, Injectable, Injector } from '@angular/core'; + +import { ActiveToast, IndividualConfig, ToastrService } from 'ngx-toastr'; import { BehaviorSubject, forkJoin } from 'rxjs'; +import { debounceTime, first } from 'rxjs/operators'; import { ConfigService } from '../../config/config.service'; - -import { Message, MessageOptions } from './message.interface'; -import { ActiveToast, IndividualConfig, ToastrService } from 'ngx-toastr'; -import { MessageType } from './message.enum'; import { LanguageService } from '../../language/shared/language.service'; -import { debounceTime, first } from 'rxjs/operators'; +import { MessageType } from './message.enum'; +import { Message, MessageOptions } from './message.interface'; interface ActiveMessageTranslation { id: number; diff --git a/packages/core/src/lib/network/network.service.ts b/packages/core/src/lib/network/network.service.ts index e727648bec..45748ecba5 100644 --- a/packages/core/src/lib/network/network.service.ts +++ b/packages/core/src/lib/network/network.service.ts @@ -1,4 +1,5 @@ -import { Injectable, EventEmitter, OnDestroy, Injector } from '@angular/core'; +import { EventEmitter, Injectable, Injector, OnDestroy } from '@angular/core'; + import { Observable, Subscription, fromEvent } from 'rxjs'; import { debounceTime, startWith } from 'rxjs/operators'; diff --git a/packages/core/src/lib/regex/regex.service.ts b/packages/core/src/lib/regex/regex.service.ts index a90682a54a..40bd1c4558 100644 --- a/packages/core/src/lib/regex/regex.service.ts +++ b/packages/core/src/lib/regex/regex.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; + import { ConfigService } from '../config/config.service'; import { RegexOptions } from './regex.interface'; diff --git a/packages/core/src/lib/request/error.interceptor.ts b/packages/core/src/lib/request/error.interceptor.ts index 9bce0eb89e..b26336e5a4 100644 --- a/packages/core/src/lib/request/error.interceptor.ts +++ b/packages/core/src/lib/request/error.interceptor.ts @@ -1,11 +1,11 @@ -import { Injectable } from '@angular/core'; import { - HttpInterceptor, - HttpHandler, - HttpRequest, + HttpErrorResponse, HttpEvent, - HttpErrorResponse + HttpHandler, + HttpInterceptor, + HttpRequest } from '@angular/common/http'; +import { Injectable } from '@angular/core'; import { Observable, throwError } from 'rxjs'; import { catchError, finalize } from 'rxjs/operators'; diff --git a/packages/core/src/lib/request/error.module.ts b/packages/core/src/lib/request/error.module.ts index 2300229a3c..3812ece14f 100644 --- a/packages/core/src/lib/request/error.module.ts +++ b/packages/core/src/lib/request/error.module.ts @@ -1,10 +1,10 @@ +import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { - NgModule, ModuleWithProviders, + NgModule, Optional, SkipSelf } from '@angular/core'; -import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { ErrorInterceptor } from './error.interceptor'; diff --git a/packages/core/src/lib/request/logging.interceptor.ts b/packages/core/src/lib/request/logging.interceptor.ts index cbc1fa920d..60a1a4df3c 100644 --- a/packages/core/src/lib/request/logging.interceptor.ts +++ b/packages/core/src/lib/request/logging.interceptor.ts @@ -1,14 +1,14 @@ -import { Injectable } from '@angular/core'; import { - HttpInterceptor, - HttpHandler, HttpEvent, + HttpHandler, + HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http'; +import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { tap, finalize } from 'rxjs/operators'; +import { finalize, tap } from 'rxjs/operators'; @Injectable() export class LoggingInterceptor implements HttpInterceptor { diff --git a/packages/core/src/lib/request/logging.module.ts b/packages/core/src/lib/request/logging.module.ts index 2497f62e25..f66d2084f5 100644 --- a/packages/core/src/lib/request/logging.module.ts +++ b/packages/core/src/lib/request/logging.module.ts @@ -1,5 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { LoggingInterceptor } from './logging.interceptor'; diff --git a/packages/core/src/lib/route/route.service.spec.ts b/packages/core/src/lib/route/route.service.spec.ts index 14b40ead79..692c787312 100644 --- a/packages/core/src/lib/route/route.service.spec.ts +++ b/packages/core/src/lib/route/route.service.spec.ts @@ -1,8 +1,9 @@ import { TestBed, inject } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; -import { of } from 'rxjs'; import { RouterTestingModule } from '@angular/router/testing'; +import { of } from 'rxjs'; + import { RouteService } from './route.service'; describe('RouteService', () => { diff --git a/packages/core/src/lib/route/route.service.ts b/packages/core/src/lib/route/route.service.ts index 939d85cc38..d23f5dddf3 100644 --- a/packages/core/src/lib/route/route.service.ts +++ b/packages/core/src/lib/route/route.service.ts @@ -1,5 +1,6 @@ -import { Injectable, Inject, InjectionToken, Optional } from '@angular/core'; +import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'; import { ActivatedRoute, Params, Router } from '@angular/router'; + import { Observable } from 'rxjs'; import { RouteServiceOptions } from './route.interface'; diff --git a/packages/core/src/lib/storage/storage.service.ts b/packages/core/src/lib/storage/storage.service.ts index 3f3a26a35c..09956c95a1 100644 --- a/packages/core/src/lib/storage/storage.service.ts +++ b/packages/core/src/lib/storage/storage.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { ConfigService } from '../config/config.service'; -import { StorageOptions } from './storage.interface'; import { BaseStorage } from './storage'; +import { StorageOptions } from './storage.interface'; @Injectable({ providedIn: 'root' diff --git a/packages/core/src/lib/storage/storage.ts b/packages/core/src/lib/storage/storage.ts index 3362ea915d..39273552fa 100644 --- a/packages/core/src/lib/storage/storage.ts +++ b/packages/core/src/lib/storage/storage.ts @@ -1,11 +1,12 @@ +import { BehaviorSubject } from 'rxjs'; + import { ConfigService } from '../config/config.service'; import { - StorageScope, StorageOptions, + StorageScope, StorageServiceEvent, StorageServiceEventEnum } from './storage.interface'; -import { BehaviorSubject } from 'rxjs'; export abstract class BaseStorage { protected options?: T; diff --git a/packages/core/src/theming/prebuilt-themes/qcca/components/scrollbar.scss b/packages/core/src/theming/prebuilt-themes/qcca/components/scrollbar.scss index f9b06daf5c..60151fb77d 100644 --- a/packages/core/src/theming/prebuilt-themes/qcca/components/scrollbar.scss +++ b/packages/core/src/theming/prebuilt-themes/qcca/components/scrollbar.scss @@ -1,15 +1,15 @@ @use '../base'; *::-webkit-scrollbar { - width: 6px; + width: 6px; } *::-webkit-scrollbar-track { - box-shadow: inset 0 0 5px base.$blue-light; - border-radius: 10px; + box-shadow: inset 0 0 5px base.$blue-light; + border-radius: 10px; } *::-webkit-scrollbar-thumb { - background: base.$blue-normal-piv; - border-radius: 10px; -} \ No newline at end of file + background: base.$blue-normal-piv; + border-radius: 10px; +} diff --git a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-group.component.ts b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-group.component.ts index 71bf3ee039..86e243b1a3 100644 --- a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-group.component.ts +++ b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-group.component.ts @@ -1,18 +1,19 @@ import { + ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, - ChangeDetectionStrategy, + Input, + OnDestroy, OnInit, - OnDestroy + Output } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; - import { EntityStore } from '@igo2/common'; import type { EntityStateManager } from '@igo2/common'; +import { BehaviorSubject } from 'rxjs'; + +import { IgoMap } from '../../map/shared'; import { AddedChangeEmitter, AddedChangeGroupEmitter, @@ -22,7 +23,6 @@ import { CatalogItemState, CatalogItemType } from '../shared'; -import { IgoMap } from '../../map/shared'; /** * Catalog browser group item diff --git a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.ts b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.ts index 1c4c696aa3..8f27e4e348 100644 --- a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.ts +++ b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.ts @@ -1,22 +1,23 @@ import { - Component, - Input, ChangeDetectionStrategy, - Output, + Component, EventEmitter, + Input, + OnDestroy, OnInit, - OnDestroy + Output } from '@angular/core'; -import { getEntityTitle, getEntityIcon } from '@igo2/common'; +import { getEntityIcon, getEntityTitle } from '@igo2/common'; -import { AddedChangeEmitter, CatalogItemLayer } from '../shared'; import { BehaviorSubject, Subscription } from 'rxjs'; -import { LayerService } from '../../layer/shared/layer.service'; import { first } from 'rxjs/operators'; + +import { LayerService } from '../../layer/shared/layer.service'; import { Layer, TooltipType } from '../../layer/shared/layers'; -import { MetadataLayerOptions } from '../../metadata/shared/metadata.interface'; import { IgoMap } from '../../map/shared'; +import { MetadataLayerOptions } from '../../metadata/shared/metadata.interface'; +import { AddedChangeEmitter, CatalogItemLayer } from '../shared'; /** * Catalog browser layer item diff --git a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.component.ts b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.component.ts index f163c51a3d..2824207811 100644 --- a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.component.ts +++ b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.component.ts @@ -1,28 +1,28 @@ import { - Component, - Input, ChangeDetectionStrategy, ChangeDetectorRef, - OnInit, - OnDestroy + Component, + Input, + OnDestroy, + OnInit } from '@angular/core'; -import { zip, BehaviorSubject } from 'rxjs'; - import { EntityStore, EntityStoreWatcher } from '@igo2/common'; -import { Layer } from '../../layer/shared/layers/layer'; + +import { BehaviorSubject, zip } from 'rxjs'; + import { LayerService } from '../../layer/shared/layer.service'; +import { Layer } from '../../layer/shared/layers/layer'; import { IgoMap } from '../../map/shared'; - import { + AddedChangeEmitter, + AddedChangeGroupEmitter, Catalog, CatalogItem, - CatalogItemLayer, CatalogItemGroup, + CatalogItemLayer, CatalogItemState, - CatalogItemType, - AddedChangeEmitter, - AddedChangeGroupEmitter + CatalogItemType } from '../shared'; /** diff --git a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.module.ts b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.module.ts index 840b07d319..477cc5b758 100644 --- a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.module.ts +++ b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.module.ts @@ -1,24 +1,23 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { NgModule } from '@angular/core'; import { MatBadgeModule } from '@angular/material/badge'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatListModule } from '@angular/material/list'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { IgoLanguageModule } from '@igo2/core'; import { - IgoMatBadgeIconModule, IgoCollapsibleModule, - IgoListModule + IgoListModule, + IgoMatBadgeIconModule } from '@igo2/common'; +import { IgoLanguageModule } from '@igo2/core'; +import { IgoLayerModule } from '../../layer/layer.module'; import { IgoMetadataModule } from './../../metadata/metadata.module'; -import { CatalogBrowserComponent } from './catalog-browser.component'; -import { CatalogBrowserLayerComponent } from './catalog-browser-layer.component'; import { CatalogBrowserGroupComponent } from './catalog-browser-group.component'; -import { IgoLayerModule } from '../../layer/layer.module'; +import { CatalogBrowserLayerComponent } from './catalog-browser-layer.component'; +import { CatalogBrowserComponent } from './catalog-browser.component'; /** * @ignore diff --git a/packages/geo/src/lib/catalog/catalog-library/add-catalog-dialog.component.ts b/packages/geo/src/lib/catalog/catalog-library/add-catalog-dialog.component.ts index 9a3a3dee07..db98d32ced 100644 --- a/packages/geo/src/lib/catalog/catalog-library/add-catalog-dialog.component.ts +++ b/packages/geo/src/lib/catalog/catalog-library/add-catalog-dialog.component.ts @@ -1,14 +1,16 @@ -import { LanguageService, ConfigService } from '@igo2/core'; -import { Component, OnInit, OnDestroy, Optional, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { Component, Inject, OnDestroy, OnInit, Optional } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; -import { Subscription, BehaviorSubject } from 'rxjs'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { EntityStore } from '@igo2/common'; +import { ConfigService, LanguageService } from '@igo2/core'; + +import { BehaviorSubject, Subscription } from 'rxjs'; + import { TypeCapabilities } from '../../datasource'; import { Catalog } from '../shared/catalog.abstract'; diff --git a/packages/geo/src/lib/catalog/catalog-library/catalog-library-item.component.ts b/packages/geo/src/lib/catalog/catalog-library/catalog-library-item.component.ts index 4a9c29a11d..7baf51b341 100644 --- a/packages/geo/src/lib/catalog/catalog-library/catalog-library-item.component.ts +++ b/packages/geo/src/lib/catalog/catalog-library/catalog-library-item.component.ts @@ -1,12 +1,13 @@ import { + ChangeDetectionStrategy, Component, + EventEmitter, Input, - ChangeDetectionStrategy, - Output, - EventEmitter + Output } from '@angular/core'; import { getEntityTitle } from '@igo2/common'; + import { IgoMap } from '../../map/shared'; import { Catalog } from '../shared/catalog.abstract'; diff --git a/packages/geo/src/lib/catalog/catalog-library/catalog-library.component.ts b/packages/geo/src/lib/catalog/catalog-library/catalog-library.component.ts index 24d4bd5117..41568bc813 100644 --- a/packages/geo/src/lib/catalog/catalog-library/catalog-library.component.ts +++ b/packages/geo/src/lib/catalog/catalog-library/catalog-library.component.ts @@ -1,20 +1,22 @@ import { + ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, - ChangeDetectionStrategy, + Input, + OnDestroy, OnInit, - OnDestroy + Output } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { EntityStore } from '@igo2/common'; import { MessageService, StorageService } from '@igo2/core'; import { ObjectUtils } from '@igo2/utils'; + import { Observable, Subscription } from 'rxjs'; import { catchError } from 'rxjs/operators'; import { Md5 } from 'ts-md5'; + import { CapabilitiesService } from '../../datasource'; import { IgoMap } from '../../map/shared'; import { standardizeUrl } from '../../utils/id-generator'; diff --git a/packages/geo/src/lib/catalog/catalog-library/catalog-library.module.ts b/packages/geo/src/lib/catalog/catalog-library/catalog-library.module.ts index 7858e2f419..7e9d2c7a44 100644 --- a/packages/geo/src/lib/catalog/catalog-library/catalog-library.module.ts +++ b/packages/geo/src/lib/catalog/catalog-library/catalog-library.module.ts @@ -1,25 +1,23 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { NgModule } from '@angular/core'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatBadgeModule } from '@angular/material/badge'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; import { MatListModule } from '@angular/material/list'; +import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; import { IgoListModule } from '@igo2/common'; +import { IgoLanguageModule } from '@igo2/core'; -import { CatalogLibaryComponent } from './catalog-library.component'; -import { CatalogLibaryItemComponent } from './catalog-library-item.component'; import { AddCatalogDialogComponent } from './add-catalog-dialog.component'; - -import { MatBadgeModule } from '@angular/material/badge'; -import { IgoLanguageModule } from '@igo2/core'; -import { MatButtonModule } from '@angular/material/button'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { ReactiveFormsModule } from '@angular/forms'; -import { MatInputModule } from '@angular/material/input'; -import { MatSelectModule } from '@angular/material/select'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatDialogModule } from '@angular/material/dialog'; +import { CatalogLibaryItemComponent } from './catalog-library-item.component'; +import { CatalogLibaryComponent } from './catalog-library.component'; /** * @ignore diff --git a/packages/geo/src/lib/catalog/catalog.module.ts b/packages/geo/src/lib/catalog/catalog.module.ts index 394cebabac..4203d7b6f5 100644 --- a/packages/geo/src/lib/catalog/catalog.module.ts +++ b/packages/geo/src/lib/catalog/catalog.module.ts @@ -1,13 +1,13 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { MatBadgeModule } from '@angular/material/badge'; import { MatIconModule } from '@angular/material/icon'; import { MatListModule } from '@angular/material/list'; import { MatTooltipModule } from '@angular/material/tooltip'; import { - IgoListModule, IgoCollapsibleModule, + IgoListModule, IgoMatBadgeIconModule } from '@igo2/common'; diff --git a/packages/geo/src/lib/catalog/shared/catalog.abstract.ts b/packages/geo/src/lib/catalog/shared/catalog.abstract.ts index 120b2f1353..3e1b3ef076 100644 --- a/packages/geo/src/lib/catalog/shared/catalog.abstract.ts +++ b/packages/geo/src/lib/catalog/shared/catalog.abstract.ts @@ -1,11 +1,10 @@ import { Observable } from 'rxjs'; -import { TooltipType } from '../../layer/shared'; import { TimeFilterOptions } from '../../filter/shared'; +import { TooltipType } from '../../layer/shared'; import { QueryFormat, QueryHtmlTarget } from '../../query/shared'; - -import { ICatalog, CatalogItem, CatalogItemGroup } from './catalog.interface'; import { TypeCatalogStrings } from './catalog.enum'; +import { CatalogItem, CatalogItemGroup, ICatalog } from './catalog.interface'; export abstract class Catalog implements ICatalog { id: string; diff --git a/packages/geo/src/lib/catalog/shared/catalog.interface.ts b/packages/geo/src/lib/catalog/shared/catalog.interface.ts index 646e1aa2f2..8dcec971c8 100644 --- a/packages/geo/src/lib/catalog/shared/catalog.interface.ts +++ b/packages/geo/src/lib/catalog/shared/catalog.interface.ts @@ -1,9 +1,8 @@ import { EntityState } from '@igo2/common'; -import { MetadataLayerOptions } from './../../metadata/shared/metadata.interface'; import { TooltipType } from '../../layer'; import { QueryFormat } from '../../query'; - +import { MetadataLayerOptions } from './../../metadata/shared/metadata.interface'; import { CatalogItemType, TypeCatalogStrings } from './catalog.enum'; export interface AddedChangeEmitter { diff --git a/packages/geo/src/lib/catalog/shared/catalog.service.ts b/packages/geo/src/lib/catalog/shared/catalog.service.ts index 30c87df38d..0dbdbbb6f3 100644 --- a/packages/geo/src/lib/catalog/shared/catalog.service.ts +++ b/packages/geo/src/lib/catalog/shared/catalog.service.ts @@ -1,30 +1,31 @@ -import { Injectable } from '@angular/core'; import { HttpClient, HttpErrorResponse } from '@angular/common/http'; +import { Injectable } from '@angular/core'; + +import { ConfigService, LanguageService, MessageService } from '@igo2/core'; +import { ObjectUtils, uuid } from '@igo2/utils'; + import { EMPTY, Observable, of, zip } from 'rxjs'; -import { map, catchError } from 'rxjs/operators'; +import { catchError, map } from 'rxjs/operators'; -import { uuid, ObjectUtils } from '@igo2/utils'; -import { LanguageService, MessageService, ConfigService } from '@igo2/core'; import { + ArcGISRestDataSourceOptions, CapabilitiesService, WMSDataSourceOptions, WMSDataSourceOptionsParams, - WMTSDataSourceOptions, - ArcGISRestDataSourceOptions + WMTSDataSourceOptions } from '../../datasource'; -import { LayerOptions, ImageLayerOptions } from '../../layer/shared'; +import { ImageLayerOptions, LayerOptions } from '../../layer/shared'; import { getResolutionFromScale } from '../../map/shared'; - +import { QueryFormat } from '../../query/shared'; +import { generateIdFromSourceOptions } from '../../utils'; +import { Catalog } from './catalog.abstract'; +import { CatalogItemType, TypeCatalog } from './catalog.enum'; import { CatalogItem, - CatalogItemLayer, CatalogItemGroup, + CatalogItemLayer, ForcedProperty } from './catalog.interface'; -import { Catalog } from './catalog.abstract'; -import { CatalogItemType, TypeCatalog } from './catalog.enum'; -import { QueryFormat } from '../../query/shared'; -import { generateIdFromSourceOptions } from '../../utils'; import { ArcGISRestCatalog, BaselayersCatalog, diff --git a/packages/geo/src/lib/catalog/shared/catalogs.ts b/packages/geo/src/lib/catalog/shared/catalogs.ts index 227efdf16d..15a60205d2 100644 --- a/packages/geo/src/lib/catalog/shared/catalogs.ts +++ b/packages/geo/src/lib/catalog/shared/catalogs.ts @@ -1,4 +1,5 @@ import { Observable } from 'rxjs'; + import { Catalog, CollectCatalogItemsFn } from './catalog.abstract'; import { TypeCatalog } from './catalog.enum'; import { diff --git a/packages/geo/src/lib/datasource/datasource.module.ts b/packages/geo/src/lib/datasource/datasource.module.ts index ce0cf55c83..e19501b1ec 100644 --- a/packages/geo/src/lib/datasource/datasource.module.ts +++ b/packages/geo/src/lib/datasource/datasource.module.ts @@ -1,4 +1,4 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; @NgModule({ imports: [], diff --git a/packages/geo/src/lib/datasource/shared/capabilities.service.spec.ts b/packages/geo/src/lib/datasource/shared/capabilities.service.spec.ts index b3f13e71cd..bc101bb2d2 100644 --- a/packages/geo/src/lib/datasource/shared/capabilities.service.spec.ts +++ b/packages/geo/src/lib/datasource/shared/capabilities.service.spec.ts @@ -1,5 +1,5 @@ -import { TestBed, inject } from '@angular/core/testing'; import { HttpClientModule } from '@angular/common/http'; +import { TestBed, inject } from '@angular/core/testing'; import { CapabilitiesService } from './capabilities.service'; diff --git a/packages/geo/src/lib/datasource/shared/capabilities.service.ts b/packages/geo/src/lib/datasource/shared/capabilities.service.ts index 412a987cc0..64bafb0e8b 100644 --- a/packages/geo/src/lib/datasource/shared/capabilities.service.ts +++ b/packages/geo/src/lib/datasource/shared/capabilities.service.ts @@ -1,39 +1,40 @@ -import { Injectable } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; -import { Observable, forkJoin, of } from 'rxjs'; -import { map, catchError } from 'rxjs/operators'; -import { Cacheable } from 'ts-cacheable'; +import { Injectable } from '@angular/core'; + +import { ObjectUtils } from '@igo2/utils'; -import { WMSCapabilities, WMTSCapabilities, EsriJSON } from 'ol/format'; -import { optionsFromCapabilities } from 'ol/source/WMTS.js'; import olAttribution from 'ol/control/Attribution'; +import { EsriJSON, WMSCapabilities, WMTSCapabilities } from 'ol/format'; +import * as olproj from 'ol/proj'; +import { optionsFromCapabilities } from 'ol/source/WMTS.js'; -import { ObjectUtils } from '@igo2/utils'; +import { Observable, forkJoin, of } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; +import { Cacheable } from 'ts-cacheable'; + +import { + TimeFilterStyle, + TimeFilterType +} from '../../filter/shared/time-filter.enum'; +import { + ItemStyleOptions, + LegendOptions +} from '../../layer/shared/layers/legend.interface'; import { MapService } from '../../map/shared/map.service'; import { getResolutionFromScale } from '../../map/shared/map.utils'; -import { EsriStyleGenerator } from '../../style/shared/datasource/esri-style-generator'; import { QueryFormat, QueryFormatMimeType } from '../../query/shared/query.enums'; - +import { EsriStyleGenerator } from '../../style/shared/datasource/esri-style-generator'; import { - WMTSDataSourceOptions, - WMSDataSourceOptions, - CartoDataSourceOptions, ArcGISRestDataSourceOptions, + ArcGISRestImageDataSourceOptions, + CartoDataSourceOptions, TileArcGISRestDataSourceOptions, - ArcGISRestImageDataSourceOptions + WMSDataSourceOptions, + WMTSDataSourceOptions } from './datasources'; -import { - LegendOptions, - ItemStyleOptions -} from '../../layer/shared/layers/legend.interface'; -import { - TimeFilterType, - TimeFilterStyle -} from '../../filter/shared/time-filter.enum'; -import * as olproj from 'ol/proj'; export enum TypeCapabilities { wms = 'wms', diff --git a/packages/geo/src/lib/datasource/shared/datasource.service.ts b/packages/geo/src/lib/datasource/shared/datasource.service.ts index 6145551d38..c32049bd4b 100644 --- a/packages/geo/src/lib/datasource/shared/datasource.service.ts +++ b/packages/geo/src/lib/datasource/shared/datasource.service.ts @@ -1,45 +1,47 @@ import { Injectable, Optional } from '@angular/core'; -import { forkJoin, of, Observable, BehaviorSubject } from 'rxjs'; -import { map, catchError } from 'rxjs/operators'; +import { AuthInterceptor } from '@igo2/auth'; +import { LanguageService, MessageService } from '@igo2/core'; +import { ObjectUtils } from '@igo2/utils'; + +import { BehaviorSubject, Observable, forkJoin, of } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; + +import { ProjectionService } from '../../map/shared/projection.service'; import { CapabilitiesService } from './capabilities.service'; -import { OptionsService } from './options/options.service'; -import { WFSService } from './datasources/wfs.service'; import { + AnyDataSourceOptions, + ArcGISRestDataSource, + ArcGISRestDataSourceOptions, + ArcGISRestImageDataSourceOptions, + CartoDataSource, + CartoDataSourceOptions, + ClusterDataSource, + ClusterDataSourceOptions, DataSource, - OSMDataSource, - OSMDataSourceOptions, FeatureDataSource, FeatureDataSourceOptions, - XYZDataSource, - XYZDataSourceOptions, + ImageArcGISRestDataSource, + MVTDataSource, + MVTDataSourceOptions, + OSMDataSource, + OSMDataSourceOptions, + TileArcGISRestDataSource, + TileArcGISRestDataSourceOptions, TileDebugDataSource, TileDebugDataSourceOptions, WFSDataSource, WFSDataSourceOptions, - WMTSDataSource, - WMTSDataSourceOptions, WMSDataSource, WMSDataSourceOptions, - CartoDataSource, - CartoDataSourceOptions, - ArcGISRestDataSource, - ArcGISRestDataSourceOptions, - ImageArcGISRestDataSource, - ArcGISRestImageDataSourceOptions, - TileArcGISRestDataSource, - TileArcGISRestDataSourceOptions, + WMTSDataSource, + WMTSDataSourceOptions, WebSocketDataSource, - AnyDataSourceOptions, - MVTDataSource, - MVTDataSourceOptions, - ClusterDataSource, - ClusterDataSourceOptions + XYZDataSource, + XYZDataSourceOptions } from './datasources'; -import { ObjectUtils } from '@igo2/utils'; -import { LanguageService, MessageService } from '@igo2/core'; -import { ProjectionService } from '../../map/shared/projection.service'; -import { AuthInterceptor } from '@igo2/auth'; +import { WFSService } from './datasources/wfs.service'; +import { OptionsService } from './options/options.service'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/datasource/shared/datasources/any-datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/any-datasource.interface.ts index 74438d0e2d..fcdbd13c90 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/any-datasource.interface.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/any-datasource.interface.ts @@ -1,17 +1,17 @@ +import { ArcGISRestDataSourceOptions } from './arcgisrest-datasource.interface'; +import { CartoDataSourceOptions } from './carto-datasource.interface'; +import { ClusterDataSourceOptions } from './cluster-datasource.interface'; import { DataSourceOptions } from './datasource.interface'; -import { OSMDataSourceOptions } from './osm-datasource.interface'; -import { XYZDataSourceOptions } from './xyz-datasource.interface'; -import { WMSDataSourceOptions } from './wms-datasource.interface'; -import { WMTSDataSourceOptions } from './wmts-datasource.interface'; -import { WFSDataSourceOptions } from './wfs-datasource.interface'; import { FeatureDataSourceOptions } from './feature-datasource.interface'; -import { CartoDataSourceOptions } from './carto-datasource.interface'; -import { ArcGISRestDataSourceOptions } from './arcgisrest-datasource.interface'; -import { TileArcGISRestDataSourceOptions } from './tilearcgisrest-datasource.interface'; +import { ArcGISRestImageDataSourceOptions } from './imagearcgisrest-datasource.interface'; import { MVTDataSourceOptions } from './mvt-datasource.interface'; -import { ClusterDataSourceOptions } from './cluster-datasource.interface'; +import { OSMDataSourceOptions } from './osm-datasource.interface'; +import { TileArcGISRestDataSourceOptions } from './tilearcgisrest-datasource.interface'; import { TileDebugDataSourceOptions } from './tiledebug-datasource.interface'; -import { ArcGISRestImageDataSourceOptions } from './imagearcgisrest-datasource.interface'; +import { WFSDataSourceOptions } from './wfs-datasource.interface'; +import { WMSDataSourceOptions } from './wms-datasource.interface'; +import { WMTSDataSourceOptions } from './wmts-datasource.interface'; +import { XYZDataSourceOptions } from './xyz-datasource.interface'; export type AnyDataSourceOptions = | DataSourceOptions diff --git a/packages/geo/src/lib/datasource/shared/datasources/any-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/any-datasource.ts index 6f5004461d..e088afe9bf 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/any-datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/any-datasource.ts @@ -1,18 +1,18 @@ +import { ArcGISRestDataSource } from './arcgisrest-datasource'; +import { CartoDataSource } from './carto-datasource'; +import { ClusterDataSource } from './cluster-datasource'; import { DataSource } from './datasource'; -import { OSMDataSource } from './osm-datasource'; -import { XYZDataSource } from './xyz-datasource'; -import { WMSDataSource } from './wms-datasource'; -import { WMTSDataSource } from './wmts-datasource'; -import { WFSDataSource } from './wfs-datasource'; import { FeatureDataSource } from './feature-datasource'; -import { CartoDataSource } from './carto-datasource'; -import { ArcGISRestDataSource } from './arcgisrest-datasource'; -import { TileArcGISRestDataSource } from './tilearcgisrest-datasource'; -import { WebSocketDataSource } from './websocket-datasource'; +import { ImageArcGISRestDataSource } from './imagearcgisrest-datasource'; import { MVTDataSource } from './mvt-datasource'; -import { ClusterDataSource } from './cluster-datasource'; +import { OSMDataSource } from './osm-datasource'; +import { TileArcGISRestDataSource } from './tilearcgisrest-datasource'; import { TileDebugDataSource } from './tiledebug-datasource'; -import { ImageArcGISRestDataSource } from './imagearcgisrest-datasource'; +import { WebSocketDataSource } from './websocket-datasource'; +import { WFSDataSource } from './wfs-datasource'; +import { WMSDataSource } from './wms-datasource'; +import { WMTSDataSource } from './wmts-datasource'; +import { XYZDataSource } from './xyz-datasource'; export type AnyDataSource = | DataSource diff --git a/packages/geo/src/lib/datasource/shared/datasources/arcgisrest-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/arcgisrest-datasource.ts index 41370a4a13..5ed21059bb 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/arcgisrest-datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/arcgisrest-datasource.ts @@ -1,11 +1,11 @@ -import olSourceVector from 'ol/source/Vector'; import olFormatEsriJSON from 'ol/format/EsriJSON'; -import * as olloadingstrategy from 'ol/loadingstrategy'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import * as olloadingstrategy from 'ol/loadingstrategy'; +import olSourceVector from 'ol/source/Vector'; +import { ArcGISRestDataSourceOptions } from './arcgisrest-datasource.interface'; import { DataSource } from './datasource'; import { Legend } from './datasource.interface'; -import { ArcGISRestDataSourceOptions } from './arcgisrest-datasource.interface'; export class ArcGISRestDataSource extends DataSource { public declare ol: olSourceVector; diff --git a/packages/geo/src/lib/datasource/shared/datasources/carto-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/carto-datasource.ts index 3e41cc5dc1..1da42c1632 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/carto-datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/carto-datasource.ts @@ -1,9 +1,9 @@ import olSourceCarto from 'ol/source/CartoDB'; +import { QueryHtmlTarget } from '../../../query/shared/query.enums'; +import { CartoDataSourceOptions } from './carto-datasource.interface'; import { DataSource } from './datasource'; import { Legend } from './datasource.interface'; -import { CartoDataSourceOptions } from './carto-datasource.interface'; -import { QueryHtmlTarget } from '../../../query/shared/query.enums'; export class CartoDataSource extends DataSource { public declare ol: olSourceCarto; diff --git a/packages/geo/src/lib/datasource/shared/datasources/cluster-datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/cluster-datasource.interface.ts index 4512ed4ab4..9ade04cf54 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/cluster-datasource.interface.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/cluster-datasource.interface.ts @@ -1,5 +1,5 @@ -import olSourceVector from 'ol/source/Vector'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olSourceVector from 'ol/source/Vector'; import { FeatureDataSourceOptions } from './feature-datasource.interface'; diff --git a/packages/geo/src/lib/datasource/shared/datasources/cluster-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/cluster-datasource.ts index 41f74d9ccf..9eb34787b0 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/cluster-datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/cluster-datasource.ts @@ -1,9 +1,9 @@ -import olSourceCluster from 'ol/source/Cluster'; - import { uuid } from '@igo2/utils'; -import { FeatureDataSource } from './feature-datasource'; +import olSourceCluster from 'ol/source/Cluster'; + import { ClusterDataSourceOptions } from './cluster-datasource.interface'; +import { FeatureDataSource } from './feature-datasource'; export class ClusterDataSource extends FeatureDataSource { public declare options: ClusterDataSourceOptions; diff --git a/packages/geo/src/lib/datasource/shared/datasources/datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/datasource.interface.ts index 8fce870255..0db916bd20 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/datasource.interface.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/datasource.interface.ts @@ -1,8 +1,10 @@ +import type { Type } from 'ol/geom/Geometry'; import olSource from 'ol/source/Source'; + +import { Encoders, Preset, Tokenizer } from 'flexsearch'; + import { DownloadOptions } from '../../../download/shared/download.interface'; import { OgcFilterOperatorType } from '../../../filter/shared/ogc-filter.enum'; -import type { Type } from 'ol/geom/Geometry'; -import { Encoders, Preset, Tokenizer } from 'flexsearch'; export interface DataSourceOptions { type?: diff --git a/packages/geo/src/lib/datasource/shared/datasources/datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/datasource.ts index 073fb9f1b9..aaf126b950 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/datasource.ts @@ -1,16 +1,15 @@ +import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olClusterSource from 'ol/source/Cluster'; import olSource from 'ol/source/Source'; import olVectorSource from 'ol/source/Vector'; -import olClusterSource from 'ol/source/Cluster'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; - -import { DataSourceOptions, Legend } from './datasource.interface'; -import { DataService } from './data.service'; -import { generateIdFromSourceOptions } from '../../../utils/id-generator'; import { LegendMapViewOptions, LegendOptions } from '../../../layer/shared/layers/legend.interface'; +import { generateIdFromSourceOptions } from '../../../utils/id-generator'; +import { DataService } from './data.service'; +import { DataSourceOptions, Legend } from './datasource.interface'; export abstract class DataSource { public id: string; diff --git a/packages/geo/src/lib/datasource/shared/datasources/feature-datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/feature-datasource.interface.ts index 33b6a04293..22a20a02b2 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/feature-datasource.interface.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/feature-datasource.interface.ts @@ -1,8 +1,8 @@ -import olSourceVector from 'ol/source/Vector'; import olFeature from 'ol/Feature'; import olFormatFeature from 'ol/format/Feature'; -import olSource from 'ol/source/Source'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olSource from 'ol/source/Source'; +import olSourceVector from 'ol/source/Vector'; import { DataSourceOptions } from './datasource.interface'; diff --git a/packages/geo/src/lib/datasource/shared/datasources/feature-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/feature-datasource.ts index 5e556ad0f1..c7ff445a0e 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/feature-datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/feature-datasource.ts @@ -1,6 +1,6 @@ -import olSourceVector from 'ol/source/Vector'; import * as olformat from 'ol/format'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olSourceVector from 'ol/source/Vector'; import { DataSource } from './datasource'; import { FeatureDataSourceOptions } from './feature-datasource.interface'; diff --git a/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.interface.ts index b70155bae6..47715f91b4 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.interface.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.interface.ts @@ -1,5 +1,5 @@ -import ImageArcGISRest from 'ol/source/ImageArcGISRest'; import olAttribution from 'ol/control/Attribution'; +import ImageArcGISRest from 'ol/source/ImageArcGISRest'; import { DataSourceOptions } from './datasource.interface'; diff --git a/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.ts index fdba58e8b0..b109a2a800 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/imagearcgisrest-datasource.ts @@ -1,9 +1,10 @@ import ImageArcGISRest from 'ol/source/ImageArcGISRest'; +import { QueryHtmlTarget } from '../../../query/shared/query.enums'; import { DataSource } from './datasource'; import { Legend } from './datasource.interface'; import { ArcGISRestImageDataSourceOptions } from './imagearcgisrest-datasource.interface'; -import { QueryHtmlTarget } from '../../../query/shared/query.enums'; + export class ImageArcGISRestDataSource extends DataSource { public declare ol: ImageArcGISRest; public declare options: ArcGISRestImageDataSourceOptions; diff --git a/packages/geo/src/lib/datasource/shared/datasources/mvt-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/mvt-datasource.ts index dd11637068..6f80bfd9c6 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/mvt-datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/mvt-datasource.ts @@ -1,9 +1,10 @@ -import { Md5 } from 'ts-md5'; +import { uuid } from '@igo2/utils'; + import feature from 'ol/Feature'; -import olSourceVectorTile from 'ol/source/VectorTile'; import olFormatMVT from 'ol/format/MVT'; +import olSourceVectorTile from 'ol/source/VectorTile'; -import { uuid } from '@igo2/utils'; +import { Md5 } from 'ts-md5'; import { DataSource } from './datasource'; import { MVTDataSourceOptions } from './mvt-datasource.interface'; diff --git a/packages/geo/src/lib/datasource/shared/datasources/tilearcgisrest-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/tilearcgisrest-datasource.ts index 9a4cf548d7..ac1e47d34d 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/tilearcgisrest-datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/tilearcgisrest-datasource.ts @@ -1,10 +1,10 @@ import olSourceTileArcGISRest from 'ol/source/TileArcGISRest'; import { Options } from 'ol/source/TileArcGISRest'; +import { QueryHtmlTarget } from '../../../query/shared/query.enums'; import { DataSource } from './datasource'; import { Legend } from './datasource.interface'; import { TileArcGISRestDataSourceOptions } from './tilearcgisrest-datasource.interface'; -import { QueryHtmlTarget } from '../../../query/shared/query.enums'; export class TileArcGISRestDataSource extends DataSource { public declare ol: olSourceTileArcGISRest; diff --git a/packages/geo/src/lib/datasource/shared/datasources/tiledebug-datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/tiledebug-datasource.interface.ts index 87add19abe..8d3f10a341 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/tiledebug-datasource.interface.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/tiledebug-datasource.interface.ts @@ -1,6 +1,7 @@ -import { DataSourceOptions, TileGridOptions } from './datasource.interface'; import TileDebug from 'ol/source/TileDebug'; +import { DataSourceOptions, TileGridOptions } from './datasource.interface'; + export interface TileDebugDataSourceOptions extends DataSourceOptions { projection?: string; wrapX?: boolean; diff --git a/packages/geo/src/lib/datasource/shared/datasources/websocket-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/websocket-datasource.ts index 8afed96f6e..76306e7138 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/websocket-datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/websocket-datasource.ts @@ -1,6 +1,6 @@ -import olSourceVector from 'ol/source/Vector'; import olFeature from 'ol/Feature'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olSourceVector from 'ol/source/Vector'; import { FeatureDataSource } from './feature-datasource'; import { WebSocketDataSourceOptions } from './websocket-datasource.interface'; diff --git a/packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.interface.ts index c01603815f..e75be4e333 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.interface.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.interface.ts @@ -1,6 +1,7 @@ -import olSourceVector from 'ol/source/Vector'; -import olSource from 'ol/source/Source'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olSource from 'ol/source/Source'; +import olSourceVector from 'ol/source/Vector'; + import { FeatureDataSourceOptions } from './feature-datasource.interface'; export interface WFSDataSourceOptions extends FeatureDataSourceOptions { diff --git a/packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.ts index da7306647a..0be435c478 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.ts @@ -1,25 +1,25 @@ -import olSourceVector from 'ol/source/Vector'; +import { AuthInterceptor } from '@igo2/auth'; + +import type { default as OlGeometry } from 'ol/geom/Geometry'; import * as OlLoadingStrategy from 'ol/loadingstrategy'; -import olProjection from 'ol/proj/Projection'; import * as olproj from 'ol/proj'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; - -import { DataSource } from './datasource'; -import { WFSDataSourceOptions } from './wfs-datasource.interface'; -import { WFSService } from './wfs.service'; +import olProjection from 'ol/proj/Projection'; +import olSourceVector from 'ol/source/Vector'; import { OgcFilterWriter } from '../../../filter/shared/ogc-filter'; import { OgcFilterableDataSourceOptions, OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface'; +import { DataSource } from './datasource'; +import { WFSDataSourceOptions } from './wfs-datasource.interface'; +import { WFSService } from './wfs.service'; import { - defaultFieldNameGeometry, + buildUrl, checkWfsParams, - getFormatFromOptions, - buildUrl + defaultFieldNameGeometry, + getFormatFromOptions } from './wms-wfs.utils'; -import { AuthInterceptor } from '@igo2/auth'; export class WFSDataSource extends DataSource { public declare ol: olSourceVector; diff --git a/packages/geo/src/lib/datasource/shared/datasources/wfs.service.ts b/packages/geo/src/lib/datasource/shared/datasources/wfs.service.ts index 09548015ef..899c514eab 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/wfs.service.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/wfs.service.ts @@ -1,19 +1,23 @@ -import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { combineLatest, Observable, of } from 'rxjs'; +import { Injectable } from '@angular/core'; + import olFeature from 'ol/Feature'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; + +import { Observable, combineLatest, of } from 'rxjs'; +import { concatMap } from 'rxjs/operators'; + +import { DataService } from './data.service'; import { WFSDataSourceOptions } from './wfs-datasource.interface'; import { WMSDataSourceOptions } from './wms-datasource.interface'; -import { DataService } from './data.service'; import { - formatWFSQueryString, - gmlRegex, defaultEpsg, defaultMaxFeatures, - getFormatFromOptions + formatWFSQueryString, + getFormatFromOptions, + gmlRegex } from './wms-wfs.utils'; -import { concatMap } from 'rxjs/operators'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; + @Injectable({ providedIn: 'root' }) diff --git a/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.interface.ts index a8bc5a188f..4f7e7918ae 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.interface.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.interface.ts @@ -1,11 +1,11 @@ +import type { default as OlGeometry } from 'ol/geom/Geometry'; import olSource from 'ol/source/Source'; import olSourceVector from 'ol/source/Vector'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; import type { ServerType } from 'ol/source/wms'; +import { TimeFilterOptions } from '../../../filter'; import { DataSourceOptions } from './datasource.interface'; import { WFSDataSourceOptionsParams } from './wfs-datasource.interface'; -import { TimeFilterOptions } from '../../../filter'; export interface WMSDataSourceOptions extends DataSourceOptions { // type?: 'wms'; diff --git a/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.ts index a96469cb3d..afc9cbf799 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.ts @@ -1,31 +1,31 @@ +import { ObjectUtils } from '@igo2/utils'; + import olSourceImageWMS from 'ol/source/ImageWMS'; -import { DataSource } from './datasource'; -import { Legend } from './datasource.interface'; -import { - TimeFilterableDataSourceOptions, - WMSDataSourceOptions -} from './wms-datasource.interface'; -import { WFSService } from './wfs.service'; +import { BehaviorSubject } from 'rxjs'; +import { TimeFilterOptions } from '../../../filter'; import { OgcFilterWriter } from '../../../filter/shared/ogc-filter'; import { + OgcFilterDuringOptions, OgcFilterableDataSourceOptions, - OgcFiltersOptions, - OgcFilterDuringOptions + OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface'; +import { LegendMapViewOptions } from '../../../layer/shared/layers/legend.interface'; import { QueryHtmlTarget } from '../../../query/shared/query.enums'; +import { DataSource } from './datasource'; +import { Legend } from './datasource.interface'; +import { WFSService } from './wfs.service'; +import { + TimeFilterableDataSourceOptions, + WMSDataSourceOptions +} from './wms-datasource.interface'; import { - formatWFSQueryString, checkWfsParams, - defaultFieldNameGeometry + defaultFieldNameGeometry, + formatWFSQueryString } from './wms-wfs.utils'; -import { ObjectUtils } from '@igo2/utils'; -import { LegendMapViewOptions } from '../../../layer/shared/layers/legend.interface'; -import { BehaviorSubject } from 'rxjs'; -import { TimeFilterOptions } from '../../../filter'; - export interface TimeFilterableDataSource extends WMSDataSource { options: TimeFilterableDataSourceOptions; timeFilter$: BehaviorSubject; diff --git a/packages/geo/src/lib/datasource/shared/datasources/wms-wfs.utils.ts b/packages/geo/src/lib/datasource/shared/datasources/wms-wfs.utils.ts index 1e1c48dfe7..8d62de07c6 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/wms-wfs.utils.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/wms-wfs.utils.ts @@ -1,8 +1,3 @@ -import { WFSDataSourceOptions } from './wfs-datasource.interface'; -import { WMSDataSourceOptions } from './wms-datasource.interface'; -import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface'; -import { OgcFilterWriter } from '../../../filter/shared/ogc-filter'; - import * as OlFormat from 'ol/format'; import olFormatGML2 from 'ol/format/GML2'; import olFormatGML3 from 'ol/format/GML3'; @@ -10,6 +5,11 @@ import olFormatGML32 from 'ol/format/GML32'; import olFormatOSMXML from 'ol/format/OSMXML'; import olProjection from 'ol/proj/Projection'; +import { OgcFilterWriter } from '../../../filter/shared/ogc-filter'; +import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface'; +import { WFSDataSourceOptions } from './wfs-datasource.interface'; +import { WMSDataSourceOptions } from './wms-datasource.interface'; + export const defaultEpsg = 'EPSG:3857'; export const defaultMaxFeatures = 5000; export const defaultWfsVersion = '2.0.0'; diff --git a/packages/geo/src/lib/datasource/shared/datasources/wmts-datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/wmts-datasource.interface.ts index 2daa4a803b..b2e1f6e2b3 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/wmts-datasource.interface.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/wmts-datasource.interface.ts @@ -1,4 +1,5 @@ import olSourceWMTS from 'ol/source/WMTS'; + import { DataSourceOptions } from './datasource.interface'; export interface WMTSDataSourceOptions extends DataSourceOptions { diff --git a/packages/geo/src/lib/datasource/shared/datasources/xyz-datasource.interface.ts b/packages/geo/src/lib/datasource/shared/datasources/xyz-datasource.interface.ts index 613a21c27d..e18c51c736 100644 --- a/packages/geo/src/lib/datasource/shared/datasources/xyz-datasource.interface.ts +++ b/packages/geo/src/lib/datasource/shared/datasources/xyz-datasource.interface.ts @@ -1,4 +1,5 @@ import olSourceXYZ from 'ol/source/XYZ'; + import { DataSourceOptions } from './datasource.interface'; export interface XYZDataSourceOptions extends DataSourceOptions { diff --git a/packages/geo/src/lib/datasource/shared/options/options-api.providers.ts b/packages/geo/src/lib/datasource/shared/options/options-api.providers.ts index 86e01be562..84ae53fa83 100644 --- a/packages/geo/src/lib/datasource/shared/options/options-api.providers.ts +++ b/packages/geo/src/lib/datasource/shared/options/options-api.providers.ts @@ -2,8 +2,8 @@ import { HttpClient } from '@angular/common/http'; import { ConfigService } from '@igo2/core'; -import { OptionsService } from './options.service'; import { OptionsApiService } from './options-api.service'; +import { OptionsService } from './options.service'; export function optionsApiFactory( http: HttpClient, diff --git a/packages/geo/src/lib/datasource/shared/options/options-api.service.ts b/packages/geo/src/lib/datasource/shared/options/options-api.service.ts index d1b3d7514b..08b6d22e7c 100644 --- a/packages/geo/src/lib/datasource/shared/options/options-api.service.ts +++ b/packages/geo/src/lib/datasource/shared/options/options-api.service.ts @@ -1,5 +1,6 @@ -import { Injectable, Inject } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; +import { Inject, Injectable } from '@angular/core'; + import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -9,8 +10,8 @@ import { TileArcGISRestDataSourceOptions, WMSDataSourceOptions } from '../datasources'; -import { OptionsService } from './options.service'; import { OptionsApiOptions } from './options-api.interface'; +import { OptionsService } from './options.service'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/datasource/utils/tilegrid.ts b/packages/geo/src/lib/datasource/utils/tilegrid.ts index b16ed7937c..d71a178ba0 100644 --- a/packages/geo/src/lib/datasource/utils/tilegrid.ts +++ b/packages/geo/src/lib/datasource/utils/tilegrid.ts @@ -1,9 +1,9 @@ -import olTileGridWMTS from 'ol/tilegrid/WMTS'; -import * as olproj from 'ol/proj'; import { getTopLeft as extentGetTopLeft, getWidth as extentGetWidth } from 'ol/extent.js'; +import * as olproj from 'ol/proj'; +import olTileGridWMTS from 'ol/tilegrid/WMTS'; export function createDefaultTileGrid(epsg?: string): olTileGridWMTS { const projection = epsg ? olproj.get(epsg) : olproj.get('EPSG:3857'); diff --git a/packages/geo/src/lib/directions/directions-buttons/directions-buttons.component.ts b/packages/geo/src/lib/directions/directions-buttons/directions-buttons.component.ts index 7d3223736f..a0371a317f 100644 --- a/packages/geo/src/lib/directions/directions-buttons/directions-buttons.component.ts +++ b/packages/geo/src/lib/directions/directions-buttons/directions-buttons.component.ts @@ -1,10 +1,13 @@ import { Component, Input, Optional } from '@angular/core'; + import { LanguageService, MessageService, RouteService } from '@igo2/core'; import { Clipboard } from '@igo2/utils'; -import { Subject, BehaviorSubject } from 'rxjs'; + +import { BehaviorSubject, Subject } from 'rxjs'; + import { roundCoordTo } from '../../map/shared/map.utils'; +import { DirectionsService } from '../shared'; import { FeatureWithDirection } from '../shared/directions.interface'; - import { addStopToStore, formatDistance, @@ -16,7 +19,6 @@ import { StepFeatureStore, StopsStore } from '../shared/store'; -import { DirectionsService } from '../shared'; @Component({ selector: 'igo-directions-buttons', diff --git a/packages/geo/src/lib/directions/directions-inputs/directions-inputs.component.ts b/packages/geo/src/lib/directions/directions-inputs/directions-inputs.component.ts index b0fd01ecbe..32e3c94843 100644 --- a/packages/geo/src/lib/directions/directions-inputs/directions-inputs.component.ts +++ b/packages/geo/src/lib/directions/directions-inputs/directions-inputs.component.ts @@ -1,3 +1,4 @@ +import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; import { Component, EventEmitter, @@ -5,26 +6,26 @@ import { OnDestroy, Output } from '@angular/core'; -import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; +import { MatAutocomplete } from '@angular/material/autocomplete'; +import { MatOption } from '@angular/material/core'; + +import { LanguageService } from '@igo2/core'; -import * as olProj from 'ol/proj'; import * as olObservable from 'ol/Observable'; +import * as olProj from 'ol/proj'; -import { Stop } from '../shared/directions.interface'; +import pointOnFeature from '@turf/point-on-feature'; import { Feature } from '../../feature/shared/feature.interfaces'; -import pointOnFeature from '@turf/point-on-feature'; +import { roundCoordTo } from '../../map/shared/map.utils'; +import { DirectionRelativePositionType } from '../shared/directions.enum'; +import { Stop } from '../shared/directions.interface'; import { computeRelativePosition, removeStopFromStore, updateStoreSorting } from '../shared/directions.utils'; -import { MatAutocomplete } from '@angular/material/autocomplete'; -import { MatOption } from '@angular/material/core'; import { StopsFeatureStore, StopsStore } from '../shared/store'; -import { roundCoordTo } from '../../map/shared/map.utils'; -import { LanguageService } from '@igo2/core'; -import { DirectionRelativePositionType } from '../shared/directions.enum'; @Component({ selector: 'igo-directions-inputs', diff --git a/packages/geo/src/lib/directions/directions-results/directions-results.component.ts b/packages/geo/src/lib/directions/directions-results/directions-results.component.ts index a45c4d8bc3..3afb82bc91 100644 --- a/packages/geo/src/lib/directions/directions-results/directions-results.component.ts +++ b/packages/geo/src/lib/directions/directions-results/directions-results.component.ts @@ -5,10 +5,19 @@ import { OnDestroy, OnInit } from '@angular/core'; + import { LanguageService } from '@igo2/core'; + +import olFeature from 'ol/Feature'; +import OlGeoJSON from 'ol/format/GeoJSON'; +import * as olGeom from 'ol/geom'; + import { Subscription } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; +import { FEATURE } from '../../feature/shared/feature.enums'; +import { FeatureGeometry } from '../../feature/shared/feature.interfaces'; +import { DirectionType } from '../shared/directions.enum'; import { Direction, FeatureWithStep, @@ -21,14 +30,6 @@ import { } from '../shared/directions.utils'; import { RoutesFeatureStore, StepFeatureStore } from '../shared/store'; -import olFeature from 'ol/Feature'; -import OlGeoJSON from 'ol/format/GeoJSON'; -import * as olGeom from 'ol/geom'; - -import { FeatureGeometry } from '../../feature/shared/feature.interfaces'; -import { FEATURE } from '../../feature/shared/feature.enums'; -import { DirectionType } from '../shared/directions.enum'; - @Component({ selector: 'igo-directions-results', templateUrl: './directions-results.component.html', diff --git a/packages/geo/src/lib/directions/directions-sources/osrm-directions-source.ts b/packages/geo/src/lib/directions/directions-sources/osrm-directions-source.ts index 78bdf31050..89338b3c55 100644 --- a/packages/geo/src/lib/directions/directions-sources/osrm-directions-source.ts +++ b/packages/geo/src/lib/directions/directions-sources/osrm-directions-source.ts @@ -1,19 +1,18 @@ -import { Injectable } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; +import { Injectable } from '@angular/core'; + +import { ConfigService } from '@igo2/core'; +import { customCacheHasher, uuid } from '@igo2/utils'; + import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; - import { Cacheable } from 'ts-cacheable'; -import { customCacheHasher, uuid } from '@igo2/utils'; -import { ConfigService } from '@igo2/core'; - -import { Direction, DirectionOptions } from '../shared/directions.interface'; import { DirectionsFormat, SourceDirectionsType } from '../shared/directions.enum'; - +import { Direction, DirectionOptions } from '../shared/directions.interface'; import { DirectionsSource } from './directions-source'; import { DirectionsSourceOptions } from './directions-source.interface'; diff --git a/packages/geo/src/lib/directions/directions.component.ts b/packages/geo/src/lib/directions/directions.component.ts index f5f69a2b45..5840774a4b 100644 --- a/packages/geo/src/lib/directions/directions.component.ts +++ b/packages/geo/src/lib/directions/directions.component.ts @@ -6,24 +6,33 @@ import { OnInit } from '@angular/core'; -import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators'; - -import { LanguageService } from '@igo2/core'; import { EntityStoreWatcher } from '@igo2/common'; +import { LanguageService } from '@igo2/core'; +import { ChangeUtils, ObjectUtils } from '@igo2/utils'; +import Collection from 'ol/Collection'; import * as olCondition from 'ol/events/condition'; import * as olInteraction from 'ol/interaction'; -import * as olProj from 'ol/proj'; -import { TranslateEvent } from 'ol/interaction/Translate'; -import Collection from 'ol/Collection'; import { SelectEvent } from 'ol/interaction/Select'; +import { TranslateEvent } from 'ol/interaction/Translate'; +import * as olProj from 'ol/proj'; + +import { Subject, Subscription } from 'rxjs'; +import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators'; +import { Feature } from '../feature/shared/feature.interfaces'; +import { FeatureStoreLoadingStrategy } from '../feature/shared/strategies/loading'; +import { roundCoordTo, stringToLonLat } from '../map'; +import { QueryService } from '../query/shared/query.service'; +import { Research, SearchResult } from '../search/shared/search.interfaces'; +import { SearchService } from '../search/shared/search.service'; +import { DirectionType, ProposalType } from './shared/directions.enum'; import { DirectionOptions, FeatureWithStopProperties, Stop } from './shared/directions.interface'; -import { Subject, Subscription } from 'rxjs'; +import { DirectionsService } from './shared/directions.service'; import { addDirectionToRoutesFeatureStore, addStopToStopsFeatureStore, @@ -33,21 +42,12 @@ import { initStopsFeatureStore, updateStoreSorting } from './shared/directions.utils'; -import { Feature } from '../feature/shared/feature.interfaces'; -import { DirectionsService } from './shared/directions.service'; -import { DirectionType, ProposalType } from './shared/directions.enum'; -import { roundCoordTo, stringToLonLat } from '../map'; -import { SearchService } from '../search/shared/search.service'; -import { ChangeUtils, ObjectUtils } from '@igo2/utils'; import { RoutesFeatureStore, StepFeatureStore, StopsFeatureStore, StopsStore } from './shared/store'; -import { FeatureStoreLoadingStrategy } from '../feature/shared/strategies/loading'; -import { Research, SearchResult } from '../search/shared/search.interfaces'; -import { QueryService } from '../query/shared/query.service'; @Component({ selector: 'igo-directions', diff --git a/packages/geo/src/lib/directions/directions.module.ts b/packages/geo/src/lib/directions/directions.module.ts index 2ebeec428d..3997e5fcf2 100644 --- a/packages/geo/src/lib/directions/directions.module.ts +++ b/packages/geo/src/lib/directions/directions.module.ts @@ -1,7 +1,7 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { DragDropModule } from '@angular/cdk/drag-drop'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatButtonModule } from '@angular/material/button'; import { MatOptionModule } from '@angular/material/core'; @@ -11,17 +11,16 @@ import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatListModule } from '@angular/material/list'; import { MatSelectModule } from '@angular/material/select'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatTooltipModule } from '@angular/material/tooltip'; import { IgoLanguageModule } from '@igo2/core'; -import { provideDirectionsSourceService } from './shared/directions-source.service'; -import { DragDropModule } from '@angular/cdk/drag-drop'; -import { DirectionsInputsComponent } from './directions-inputs/directions-inputs.component'; -import { DirectionsComponent } from './directions.component'; import { DirectionsButtonsComponent } from './directions-buttons/directions-buttons.component'; +import { DirectionsInputsComponent } from './directions-inputs/directions-inputs.component'; import { DirectionsResultsComponent } from './directions-results/directions-results.component'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { DirectionsComponent } from './directions.component'; +import { provideDirectionsSourceService } from './shared/directions-source.service'; @NgModule({ imports: [ diff --git a/packages/geo/src/lib/directions/shared/directions.interface.ts b/packages/geo/src/lib/directions/shared/directions.interface.ts index 6a370851c0..203607cd87 100644 --- a/packages/geo/src/lib/directions/shared/directions.interface.ts +++ b/packages/geo/src/lib/directions/shared/directions.interface.ts @@ -1,15 +1,15 @@ import { GeoJsonGeometryTypes } from 'geojson'; + +import { Feature } from '../../feature/shared/feature.interfaces'; +import { SearchSource } from '../../search/shared/sources/source'; import { DirectionRelativePositionType, - DirectionsFormat, DirectionType, + DirectionsFormat, ProposalType, SourceDirectionsType } from './directions.enum'; -import { Feature } from '../../feature/shared/feature.interfaces'; -import { SearchSource } from '../../search/shared/sources/source'; - export interface DirectionOptions { overview?: boolean; steps?: boolean; diff --git a/packages/geo/src/lib/directions/shared/directions.service.ts b/packages/geo/src/lib/directions/shared/directions.service.ts index bb17d1fd24..187869b88a 100644 --- a/packages/geo/src/lib/directions/shared/directions.service.ts +++ b/packages/geo/src/lib/directions/shared/directions.service.ts @@ -1,23 +1,26 @@ -import { Injectable, Inject } from '@angular/core'; -import { Observable, Subject } from 'rxjs'; -import { Direction, DirectionOptions } from '../shared/directions.interface'; -import { DirectionsSource } from '../directions-sources/directions-source'; -import { DirectionsSourceService } from './directions-source.service'; +import { DOCUMENT } from '@angular/common'; +import { Inject, Injectable } from '@angular/core'; + +import { ActivityService, ConfigService, LanguageService } from '@igo2/core'; import { SubjectStatus } from '@igo2/utils'; + +import html2canvas from 'html2canvas'; import jsPDF from 'jspdf'; import 'jspdf-autotable'; +import { UserOptions } from 'jspdf-autotable'; +import moment from 'moment'; +import { Observable, Subject } from 'rxjs'; + import { IgoMap } from '../../map'; import { PrintLegendPosition, PrintService } from '../../print'; +import { DirectionsSource } from '../directions-sources/directions-source'; +import { Direction, DirectionOptions } from '../shared/directions.interface'; +import { DirectionsSourceService } from './directions-source.service'; import { formatDistance, formatDuration, formatInstruction } from './directions.utils'; -import moment from 'moment'; -import { ActivityService, ConfigService, LanguageService } from '@igo2/core'; -import html2canvas from 'html2canvas'; -import { DOCUMENT } from '@angular/common'; -import { UserOptions } from 'jspdf-autotable'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/directions/shared/directions.utils.ts b/packages/geo/src/lib/directions/shared/directions.utils.ts index 6210b68ef7..882704a1b5 100644 --- a/packages/geo/src/lib/directions/shared/directions.utils.ts +++ b/packages/geo/src/lib/directions/shared/directions.utils.ts @@ -1,31 +1,31 @@ +import { LanguageService } from '@igo2/core'; +import { NumberUtils, uuid } from '@igo2/utils'; + import olFeature from 'ol/Feature'; -import * as olStyle from 'ol/style'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; -import * as olGeom from 'ol/geom'; import OlGeoJSON from 'ol/format/GeoJSON'; +import * as olGeom from 'ol/geom'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; import * as olProj from 'ol/proj'; +import * as olStyle from 'ol/style'; -import { uuid, NumberUtils } from '@igo2/utils'; - -import { - Direction, - FeatureWithDirection, - FeatureWithStop, - Stop -} from './directions.interface'; -import { createOverlayMarkerStyle } from '../../style/shared/overlay/overlay-marker-style.utils'; -import { VectorLayer } from '../../layer/shared/layers/vector-layer'; import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource'; import { tryBindStoreLayer } from '../../feature/shared/feature-store.utils'; -import { tryAddLoadingStrategy } from '../../feature/shared/strategies.utils'; -import { FeatureStoreLoadingStrategy } from '../../feature/shared/strategies/loading'; import { FEATURE, FeatureMotion } from '../../feature/shared/feature.enums'; -import { LanguageService } from '@igo2/core'; import { FeatureGeometry } from '../../feature/shared/feature.interfaces'; +import { tryAddLoadingStrategy } from '../../feature/shared/strategies.utils'; +import { FeatureStoreLoadingStrategy } from '../../feature/shared/strategies/loading'; +import { VectorLayer } from '../../layer/shared/layers/vector-layer'; +import { createOverlayMarkerStyle } from '../../style/shared/overlay/overlay-marker-style.utils'; import { DirectionRelativePositionType, DirectionType } from './directions.enum'; +import { + Direction, + FeatureWithDirection, + FeatureWithStop, + Stop +} from './directions.interface'; import { RoutesFeatureStore, StepFeatureStore, diff --git a/packages/geo/src/lib/directions/shared/store.ts b/packages/geo/src/lib/directions/shared/store.ts index fc77eb5cea..bd8b64f5bf 100644 --- a/packages/geo/src/lib/directions/shared/store.ts +++ b/packages/geo/src/lib/directions/shared/store.ts @@ -1,5 +1,7 @@ import { EntityStore } from '@igo2/common'; + import { BehaviorSubject } from 'rxjs'; + import { FeatureStore } from '../../feature/shared/store'; import { FeatureWithDirection, diff --git a/packages/geo/src/lib/download/download-button/download-button.component.ts b/packages/geo/src/lib/download/download-button/download-button.component.ts index c2be6c1c59..e42f297a34 100644 --- a/packages/geo/src/lib/download/download-button/download-button.component.ts +++ b/packages/geo/src/lib/download/download-button/download-button.component.ts @@ -1,7 +1,6 @@ -import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Layer } from '../../layer/shared/layers/layer'; - import { DownloadDataSourceOptions } from '../shared/download.interface'; import { DownloadService } from '../shared/download.service'; diff --git a/packages/geo/src/lib/download/download.module.ts b/packages/geo/src/lib/download/download.module.ts index 3a29550129..d5bffb01fd 100644 --- a/packages/geo/src/lib/download/download.module.ts +++ b/packages/geo/src/lib/download/download.module.ts @@ -1,6 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; diff --git a/packages/geo/src/lib/download/shared/download.service.ts b/packages/geo/src/lib/download/shared/download.service.ts index 80878308f6..188788b132 100644 --- a/packages/geo/src/lib/download/shared/download.service.ts +++ b/packages/geo/src/lib/download/shared/download.service.ts @@ -1,17 +1,16 @@ import { Injectable } from '@angular/core'; -import olProjection from 'ol/proj/Projection'; -import * as olproj from 'ol/proj'; - import { MessageService } from '@igo2/core'; -import { Layer } from '../../layer/shared'; +import * as olproj from 'ol/proj'; +import olProjection from 'ol/proj/Projection'; + +import { DataSourceOptions } from '../../datasource/shared/datasources/datasource.interface'; import { OgcFilterWriter, OgcFilterableDataSourceOptions } from '../../filter/shared'; - -import { DataSourceOptions } from '../../datasource/shared/datasources/datasource.interface'; +import { Layer } from '../../layer/shared'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/draw/draw/draw-popup.component.ts b/packages/geo/src/lib/draw/draw/draw-popup.component.ts index 34841a9ce4..a874328046 100644 --- a/packages/geo/src/lib/draw/draw/draw-popup.component.ts +++ b/packages/geo/src/lib/draw/draw/draw-popup.component.ts @@ -1,26 +1,28 @@ import { Component, Inject, Input } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; + import { LanguageService } from '@igo2/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { CoordinatesUnit, GeometryType, LabelType } from '../shared/draw.enum'; + +import OlFeature from 'ol/Feature'; +import Circle from 'ol/geom/Circle'; +import { fromCircle } from 'ol/geom/Polygon'; import { transform } from 'ol/proj'; +import { getLength } from 'ol/sphere'; + import { IgoMap, roundCoordTo } from '../../map/shared'; -import OlFeature from 'ol/Feature'; import { - measureOlGeometryLength, + MeasureAreaUnit, + MeasureAreaUnitAbbreviation, + MeasureLengthUnit, + MeasureLengthUnitAbbreviation +} from '../../measure/shared/measure.enum'; +import { measureOlGeometryArea, + measureOlGeometryLength, metersToUnit, squareMetersToUnit } from '../../measure/shared/measure.utils'; -import { - MeasureLengthUnit, - MeasureLengthUnitAbbreviation, - MeasureAreaUnit, - MeasureAreaUnitAbbreviation -} from '../../measure/shared/measure.enum'; - -import { fromCircle } from 'ol/geom/Polygon'; -import { getLength } from 'ol/sphere'; -import Circle from 'ol/geom/Circle'; +import { CoordinatesUnit, GeometryType, LabelType } from '../shared/draw.enum'; import { DDtoDMS } from '../shared/draw.utils'; @Component({ diff --git a/packages/geo/src/lib/draw/draw/draw.component.ts b/packages/geo/src/lib/draw/draw/draw.component.ts index f5e459eb9b..c56328f50b 100644 --- a/packages/geo/src/lib/draw/draw/draw.component.ts +++ b/packages/geo/src/lib/draw/draw/draw.component.ts @@ -1,96 +1,92 @@ import { + animate, + state, + style, + transition, + trigger +} from '@angular/animations'; +import { + ChangeDetectionStrategy, Component, + EventEmitter, Input, - OnInit, OnDestroy, - ChangeDetectionStrategy, + OnInit, Output, - EventEmitter, ViewChild } from '@angular/core'; - -import { - FEATURE, - FeatureStore, - FeatureStoreSelectionStrategy, - tryAddLoadingStrategy, - tryAddSelectionStrategy, - FeatureMotion, - FeatureStoreLoadingStrategy, - featureToOl -} from '../../feature'; - -import { tryBindStoreLayer } from '../../feature/shared/feature-store.utils'; - -import { LanguageService } from '@igo2/core'; -import { MatDialog } from '@angular/material/dialog'; -import { CoordinatesUnit, GeometryType, LabelType } from '../shared/draw.enum'; -import { FontType } from '../../style/shared/font.enum'; -import { IgoMap } from '../../map/shared/map'; -import { BehaviorSubject, Subscription } from 'rxjs'; -import { Draw, FeatureWithDraw } from '../shared/draw.interface'; import { - UntypedFormGroup, UntypedFormBuilder, - UntypedFormControl + UntypedFormControl, + UntypedFormGroup } from '@angular/forms'; -import { VectorSourceEvent as OlVectorSourceEvent } from 'ol/source/Vector'; -import { VectorLayer } from '../../layer/shared/layers/vector-layer'; -import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource'; -import { DrawControl } from '../../geometry/shared/controls/draw'; +import { MatDialog } from '@angular/material/dialog'; + import { EntityRecord, EntityTableButton, EntityTableColumnRenderer, EntityTableTemplate } from '@igo2/common'; +import { LanguageService } from '@igo2/core'; -import * as OlStyle from 'ol/style'; -import * as olproj from 'ol/proj'; -import OlVectorSource from 'ol/source/Vector'; -import OlCircle from 'ol/geom/Circle'; -import OlPoint from 'ol/geom/Point'; import OlFeature from 'ol/Feature'; -import OlGeoJSON from 'ol/format/GeoJSON'; import OlOverlay from 'ol/Overlay'; +import OlGeoJSON from 'ol/format/GeoJSON'; +import OlCircle from 'ol/geom/Circle'; import type { Type } from 'ol/geom/Geometry'; import { default as OlGeometry } from 'ol/geom/Geometry'; +import OlPoint from 'ol/geom/Point'; +import Polygon, { fromCircle } from 'ol/geom/Polygon'; +import * as olproj from 'ol/proj'; +import { transform } from 'ol/proj'; +import { VectorSourceEvent as OlVectorSourceEvent } from 'ol/source/Vector'; +import OlVectorSource from 'ol/source/Vector'; import { getDistance, getLength } from 'ol/sphere'; -import { DrawStyleService } from '../../style/style-service/draw-style.service'; +import * as OlStyle from 'ol/style'; + +import { BehaviorSubject, Subscription } from 'rxjs'; import { first, skip } from 'rxjs/operators'; -import { DrawPopupComponent } from './draw-popup.component'; -import { DrawShorcutsComponent } from './draw-shorcuts.component'; -import { getTooltipsOfOlGeometry } from '../../measure/shared/measure.utils'; -import { createInteractionStyle, DDtoDMS } from '../shared/draw.utils'; -import { transform } from 'ol/proj'; -import { DrawIconService } from '../shared/draw-icon.service'; -import { StyleModalDrawingComponent } from '../../style/style-modal/drawing/style-modal-drawing.component'; -import { StyleModalData } from '../../style/style-modal/shared/style-modal.interface'; +import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource'; import { - trigger, - state, - style, - animate, - transition -} from '@angular/animations'; - -import { DrawLayerPopupComponent } from './draw-layer-popup.component'; - + FEATURE, + FeatureMotion, + FeatureStore, + FeatureStoreLoadingStrategy, + FeatureStoreSelectionStrategy, + featureToOl, + tryAddLoadingStrategy, + tryAddSelectionStrategy +} from '../../feature'; +import { tryBindStoreLayer } from '../../feature/shared/feature-store.utils'; +import { DrawControl } from '../../geometry/shared/controls/draw'; +import { VectorLayer } from '../../layer/shared/layers/vector-layer'; +import { IgoMap } from '../../map/shared/map'; +import { + MeasureAreaUnit, + MeasureAreaUnitAbbreviation, + MeasureLengthUnit, + MeasureLengthUnitAbbreviation +} from '../../measure/shared/measure.enum'; +import { getTooltipsOfOlGeometry } from '../../measure/shared/measure.utils'; import { - measureOlGeometryLength, measureOlGeometryArea, + measureOlGeometryLength, metersToUnit, squareMetersToUnit } from '../../measure/shared/measure.utils'; - -import { - MeasureLengthUnit, - MeasureLengthUnitAbbreviation, - MeasureAreaUnit, - MeasureAreaUnitAbbreviation -} from '../../measure/shared/measure.enum'; -import Polygon, { fromCircle } from 'ol/geom/Polygon'; +import { FontType } from '../../style/shared/font.enum'; +import { StyleModalDrawingComponent } from '../../style/style-modal/drawing/style-modal-drawing.component'; +import { StyleModalData } from '../../style/style-modal/shared/style-modal.interface'; +import { DrawStyleService } from '../../style/style-service/draw-style.service'; +import { DrawIconService } from '../shared/draw-icon.service'; +import { CoordinatesUnit, GeometryType, LabelType } from '../shared/draw.enum'; +import { Draw, FeatureWithDraw } from '../shared/draw.interface'; +import { DDtoDMS, createInteractionStyle } from '../shared/draw.utils'; +import { DrawLayerPopupComponent } from './draw-layer-popup.component'; +import { DrawPopupComponent } from './draw-popup.component'; +import { DrawShorcutsComponent } from './draw-shorcuts.component'; @Component({ selector: 'igo-draw', diff --git a/packages/geo/src/lib/draw/draw/draw.module.ts b/packages/geo/src/lib/draw/draw/draw.module.ts index 6da2c4945f..5e4cdca15f 100644 --- a/packages/geo/src/lib/draw/draw/draw.module.ts +++ b/packages/geo/src/lib/draw/draw/draw.module.ts @@ -1,32 +1,30 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { NgModule } from '@angular/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatBadgeModule } from '@angular/material/badge'; import { MatButtonModule } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatIconModule } from '@angular/material/icon'; -import { MatBadgeModule } from '@angular/material/badge'; -import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatListModule } from '@angular/material/list'; +import { MatRadioModule } from '@angular/material/radio'; import { MatSelectModule } from '@angular/material/select'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatDividerModule } from '@angular/material/divider'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { BrowserModule } from '@angular/platform-browser'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { IgoLanguageModule } from '@igo2/core'; import { IgoEntityTableModule } from '@igo2/common'; -import { DrawComponent } from './draw.component'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { IgoLanguageModule } from '@igo2/core'; + +import { DrawLayerPopupComponent } from './draw-layer-popup.component'; import { DrawPopupComponent } from './draw-popup.component'; import { DrawShorcutsComponent } from './draw-shorcuts.component'; -import { DrawLayerPopupComponent } from './draw-layer-popup.component'; - -import { BrowserModule } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; - -import { MatRadioModule } from '@angular/material/radio'; +import { DrawComponent } from './draw.component'; /** * @ignore diff --git a/packages/geo/src/lib/draw/drawingTool.module.ts b/packages/geo/src/lib/draw/drawingTool.module.ts index 3d7e2db455..302e472eea 100644 --- a/packages/geo/src/lib/draw/drawingTool.module.ts +++ b/packages/geo/src/lib/draw/drawingTool.module.ts @@ -1,4 +1,5 @@ import { NgModule } from '@angular/core'; + import { IgoDrawModule } from './draw/draw.module'; @NgModule({ diff --git a/packages/geo/src/lib/draw/shared/draw.interface.ts b/packages/geo/src/lib/draw/shared/draw.interface.ts index e83284d5dc..6d76652f93 100644 --- a/packages/geo/src/lib/draw/shared/draw.interface.ts +++ b/packages/geo/src/lib/draw/shared/draw.interface.ts @@ -1,12 +1,12 @@ +import { FeatureStore } from '../../feature'; import { Feature } from '../../feature/shared/feature.interfaces'; -import { IgoMap } from '../../map/shared/map'; import { DrawControl } from '../../geometry/shared/controls/draw'; -import { FeatureStore } from '../../feature'; -import { CoordinatesUnit, LabelType } from '../shared/draw.enum'; +import { IgoMap } from '../../map/shared/map'; import { MeasureAreaUnit, MeasureLengthUnit } from '../../measure/shared/measure.enum'; +import { CoordinatesUnit, LabelType } from '../shared/draw.enum'; export interface DrawOptions { icons?: string[]; diff --git a/packages/geo/src/lib/draw/shared/draw.utils.ts b/packages/geo/src/lib/draw/shared/draw.utils.ts index 5172c803d9..cd979aa438 100644 --- a/packages/geo/src/lib/draw/shared/draw.utils.ts +++ b/packages/geo/src/lib/draw/shared/draw.utils.ts @@ -1,15 +1,16 @@ -import * as Olstyle from 'ol/style'; -import OlPoint from 'ol/geom/Point'; +import OlOverlay from 'ol/Overlay'; +import OlCircle from 'ol/geom/Circle'; import OlLineString from 'ol/geom/LineString'; +import OlPoint from 'ol/geom/Point'; import OlPolygon from 'ol/geom/Polygon'; -import OlCircle from 'ol/geom/Circle'; -import OlOverlay from 'ol/Overlay'; +import * as Olstyle from 'ol/style'; + +import { convertDDToDMS, roundCoordToString } from '../../map/shared/map.utils'; import { - updateOlGeometryMidpoints, - updateOlGeometryCenter + updateOlGeometryCenter, + updateOlGeometryMidpoints } from '../../measure/shared/measure.utils'; import { CoordinatesUnit } from './draw.enum'; -import { convertDDToDMS, roundCoordToString } from '../../map/shared/map.utils'; /** * Create a default style diff --git a/packages/geo/src/lib/feature/feature-details/feature-details.component.ts b/packages/geo/src/lib/feature/feature-details/feature-details.component.ts index d902169d02..301bec0312 100644 --- a/packages/geo/src/lib/feature/feature-details/feature-details.component.ts +++ b/packages/geo/src/lib/feature/feature-details/feature-details.component.ts @@ -1,27 +1,29 @@ +import { HttpClient } from '@angular/common/http'; import { - Component, - Input, ChangeDetectionStrategy, ChangeDetectorRef, - Output, + Component, EventEmitter, + Input, + OnDestroy, OnInit, - OnDestroy + Output } from '@angular/core'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; -import { Subject } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; -import { NetworkService, ConnectionState, MessageService } from '@igo2/core'; -import { ConfigService } from '@igo2/core'; -import { getEntityTitle, getEntityIcon } from '@igo2/common'; +import { getEntityIcon, getEntityTitle } from '@igo2/common'; import type { Toolbox } from '@igo2/common'; +import { ConnectionState, MessageService, NetworkService } from '@igo2/core'; +import { ConfigService } from '@igo2/core'; +import { Clipboard } from '@igo2/utils'; + +import { Subject } from 'rxjs'; +import { takeUntil } from 'rxjs/operators'; -import { Feature } from '../shared'; -import { SearchSource } from '../../search/shared/sources/source'; import { IgoMap } from '../../map/shared/map'; -import { HttpClient } from '@angular/common/http'; -import { Clipboard } from '@igo2/utils'; +import { SearchSource } from '../../search/shared/sources/source'; +import { Feature } from '../shared'; + @Component({ selector: 'igo-feature-details', templateUrl: './feature-details.component.html', diff --git a/packages/geo/src/lib/feature/feature-details/feature-details.directive.ts b/packages/geo/src/lib/feature/feature-details/feature-details.directive.ts index 652eff193a..30905ee5b0 100644 --- a/packages/geo/src/lib/feature/feature-details/feature-details.directive.ts +++ b/packages/geo/src/lib/feature/feature-details/feature-details.directive.ts @@ -1,16 +1,17 @@ import { - OnInit, Directive, - Self, - HostListener, ElementRef, + EventEmitter, + HostListener, + OnInit, Output, - EventEmitter + Self } from '@angular/core'; -import { FeatureDetailsComponent } from './feature-details.component'; import { BehaviorSubject } from 'rxjs'; +import { FeatureDetailsComponent } from './feature-details.component'; + @Directive({ // This directive allow to view the route between the user coordinates and the feature selector: '[igoFeatureDetailsDirective]' diff --git a/packages/geo/src/lib/feature/feature-details/feature-details.module.ts b/packages/geo/src/lib/feature/feature-details/feature-details.module.ts index 8591eaf1f5..1d05c8493b 100644 --- a/packages/geo/src/lib/feature/feature-details/feature-details.module.ts +++ b/packages/geo/src/lib/feature/feature-details/feature-details.module.ts @@ -1,9 +1,9 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; +import { IgoImageModule, IgoKeyValueModule } from '@igo2/common'; import { IgoLanguageModule } from '@igo2/core'; -import { IgoKeyValueModule, IgoImageModule } from '@igo2/common'; import { FeatureDetailsComponent } from './feature-details.component'; import { FeatureDetailsDirective } from './feature-details.directive'; diff --git a/packages/geo/src/lib/feature/feature-form/feature-form.component.ts b/packages/geo/src/lib/feature/feature-form/feature-form.component.ts index 9fa830e33c..767c7e5647 100644 --- a/packages/geo/src/lib/feature/feature-form/feature-form.component.ts +++ b/packages/geo/src/lib/feature/feature-form/feature-form.component.ts @@ -1,18 +1,18 @@ import { + ChangeDetectionStrategy, Component, + EventEmitter, Input, Output, - EventEmitter, - ChangeDetectionStrategy, ViewChild } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; - import { Form, getEntityRevision } from '@igo2/common'; import type { FormComponent } from '@igo2/common'; import { uuid } from '@igo2/utils'; +import { BehaviorSubject } from 'rxjs'; + import { FEATURE } from '../shared/feature.enums'; import { Feature, FeatureMeta } from '../shared/feature.interfaces'; diff --git a/packages/geo/src/lib/feature/feature-form/feature-form.module.ts b/packages/geo/src/lib/feature/feature-form/feature-form.module.ts index 9fc5aa8a88..a01e2f6e3e 100644 --- a/packages/geo/src/lib/feature/feature-form/feature-form.module.ts +++ b/packages/geo/src/lib/feature/feature-form/feature-form.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { IgoFormModule } from '@igo2/common'; diff --git a/packages/geo/src/lib/feature/feature.module.ts b/packages/geo/src/lib/feature/feature.module.ts index bf29b510c9..b05b45ad09 100644 --- a/packages/geo/src/lib/feature/feature.module.ts +++ b/packages/geo/src/lib/feature/feature.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { IgoFeatureDetailsModule } from './feature-details/feature-details.module'; import { IgoFeatureFormModule } from './feature-form/feature-form.module'; diff --git a/packages/geo/src/lib/feature/shared/feature.interfaces.ts b/packages/geo/src/lib/feature/shared/feature.interfaces.ts index cb4ccacf30..9a2daf6689 100644 --- a/packages/geo/src/lib/feature/shared/feature.interfaces.ts +++ b/packages/geo/src/lib/feature/shared/feature.interfaces.ts @@ -1,20 +1,21 @@ -import OlRenderFeature from 'ol/render/Feature'; import { UntypedFormGroup } from '@angular/forms'; -import { GeoJsonGeometryTypes } from 'geojson'; - import { EntityKey, EntityStoreOptions, EntityStoreStrategyOptions } from '@igo2/common'; -import { VectorLayer } from '../../layer/shared'; -import { IgoMap } from '../../map/shared'; -import { FeatureMotion } from './feature.enums'; import OlFeature from 'ol/Feature'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import OlRenderFeature from 'ol/render/Feature'; + +import { GeoJsonGeometryTypes } from 'geojson'; + import { SourceFieldsOptionsParams } from '../../datasource'; +import { VectorLayer } from '../../layer/shared'; +import { IgoMap } from '../../map/shared'; +import { FeatureMotion } from './feature.enums'; export interface Feature

{ type: string; diff --git a/packages/geo/src/lib/feature/shared/feature.utils.ts b/packages/geo/src/lib/feature/shared/feature.utils.ts index d7ee6d340c..b178efb38c 100644 --- a/packages/geo/src/lib/feature/shared/feature.utils.ts +++ b/packages/geo/src/lib/feature/shared/feature.utils.ts @@ -1,26 +1,26 @@ -import * as olextent from 'ol/extent'; -import * as olproj from 'ol/proj'; -import * as olstyle from 'ol/style'; -import OlFeature from 'ol/Feature'; -import type { GeometryLayout } from 'ol/geom/Geometry'; -import OlPolygon from 'ol/geom/Polygon'; -import OlPoint from 'ol/geom/Point'; -import OlLineString from 'ol/geom/LineString'; -import OlRenderFeature from 'ol/render/Feature'; -import OlFormatGeoJSON from 'ol/format/GeoJSON'; -import OlLayer from 'ol/layer/Layer'; -import OlSource from 'ol/source/Source'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; -import { uuid } from '@igo2/utils'; - import { EntityKey, + getEntityIcon, getEntityId, - getEntityTitle, + getEntityProperty, getEntityRevision, - getEntityIcon, - getEntityProperty + getEntityTitle } from '@igo2/common'; +import { uuid } from '@igo2/utils'; + +import OlFeature from 'ol/Feature'; +import * as olextent from 'ol/extent'; +import OlFormatGeoJSON from 'ol/format/GeoJSON'; +import type { GeometryLayout } from 'ol/geom/Geometry'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; +import OlLineString from 'ol/geom/LineString'; +import OlPoint from 'ol/geom/Point'; +import OlPolygon from 'ol/geom/Polygon'; +import OlLayer from 'ol/layer/Layer'; +import * as olproj from 'ol/proj'; +import OlRenderFeature from 'ol/render/Feature'; +import OlSource from 'ol/source/Source'; +import * as olstyle from 'ol/style'; import { MapExtent, MapViewController } from '../../map/shared'; import { FEATURE, FeatureMotion } from './feature.enums'; diff --git a/packages/geo/src/lib/feature/shared/store.ts b/packages/geo/src/lib/feature/shared/store.ts index 6f6cac2166..3a7ef54344 100644 --- a/packages/geo/src/lib/feature/shared/store.ts +++ b/packages/geo/src/lib/feature/shared/store.ts @@ -1,23 +1,22 @@ +import { EntityKey, EntityStoreWithStrategy, getEntityId } from '@igo2/common'; + import OlFeature from 'ol/Feature'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; import * as olextent from 'ol/extent'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; import { Document } from 'flexsearch'; -import { getEntityId, EntityKey, EntityStoreWithStrategy } from '@igo2/common'; - import { FeatureDataSource } from '../../datasource'; import { VectorLayer } from '../../layer/shared'; import { IgoMap, MapExtent } from '../../map/shared'; - import { FeatureMotion } from './feature.enums'; import { Feature, FeatureStoreOptions } from './feature.interfaces'; import { computeOlFeaturesDiff, + computeOlFeaturesExtent, featureFromOl, featureToOl, - moveToOlFeatures, - computeOlFeaturesExtent + moveToOlFeatures } from './feature.utils'; /** diff --git a/packages/geo/src/lib/feature/shared/strategies.utils.ts b/packages/geo/src/lib/feature/shared/strategies.utils.ts index 4c44db7f12..8ee39ae36d 100644 --- a/packages/geo/src/lib/feature/shared/strategies.utils.ts +++ b/packages/geo/src/lib/feature/shared/strategies.utils.ts @@ -1,6 +1,6 @@ import { FeatureStore } from './store'; -import { FeatureStoreSelectionStrategy } from './strategies/selection'; import { FeatureStoreLoadingStrategy } from './strategies/loading'; +import { FeatureStoreSelectionStrategy } from './strategies/selection'; /** * Try to add a loading strategy to a store and activate it. diff --git a/packages/geo/src/lib/feature/shared/strategies/geo-properties.ts b/packages/geo/src/lib/feature/shared/strategies/geo-properties.ts index 2637a696f1..a4ac9edf99 100644 --- a/packages/geo/src/lib/feature/shared/strategies/geo-properties.ts +++ b/packages/geo/src/lib/feature/shared/strategies/geo-properties.ts @@ -1,17 +1,19 @@ import { EntityStoreStrategy } from '@igo2/common'; +import { ObjectUtils } from '@igo2/utils'; + +import { Subscription, debounceTime, pairwise } from 'rxjs'; + import { CapabilitiesService } from '../../../datasource/shared/capabilities.service'; -import { FeatureStore } from '../store'; +import { Layer } from '../../../layer/shared/layers/layer'; +import { IgoMap } from '../../../map/shared/map'; +import { GeoServiceDefinition } from '../../../utils'; +import { generateIdFromSourceOptions } from '../../../utils/id-generator'; +import { PropertyTypeDetectorService } from '../../../utils/propertyTypeDetector/propertyTypeDetector.service'; import { Feature, FeatureStorePropertyTypeStrategyOptions } from '../feature.interfaces'; -import { Subscription, debounceTime, pairwise } from 'rxjs'; -import { PropertyTypeDetectorService } from '../../../utils/propertyTypeDetector/propertyTypeDetector.service'; -import { ObjectUtils } from '@igo2/utils'; -import { generateIdFromSourceOptions } from '../../../utils/id-generator'; -import { IgoMap } from '../../../map/shared/map'; -import { Layer } from '../../../layer/shared/layers/layer'; -import { GeoServiceDefinition } from '../../../utils'; +import { FeatureStore } from '../store'; /** * This strategy maintain the store features updated to detect geoproperties diff --git a/packages/geo/src/lib/feature/shared/strategies/in-map-extent.ts b/packages/geo/src/lib/feature/shared/strategies/in-map-extent.ts index 933d47ad1c..9f581ef73e 100644 --- a/packages/geo/src/lib/feature/shared/strategies/in-map-extent.ts +++ b/packages/geo/src/lib/feature/shared/strategies/in-map-extent.ts @@ -1,10 +1,11 @@ import { EntityStoreStrategy } from '@igo2/common'; -import { FeatureStore } from '../store'; -import { FeatureStoreInMapExtentStrategyOptions } from '../feature.interfaces'; import { Subscription } from 'rxjs'; import { debounceTime, skipWhile } from 'rxjs/operators'; +import { FeatureStoreInMapExtentStrategyOptions } from '../feature.interfaces'; +import { FeatureStore } from '../store'; + /** * This strategy maintain the store features updated while the map is moved. * The features's state inside the map are tagged inMapExtent = true; diff --git a/packages/geo/src/lib/feature/shared/strategies/in-map-resolution.ts b/packages/geo/src/lib/feature/shared/strategies/in-map-resolution.ts index bc060b8f9a..3b1835215d 100644 --- a/packages/geo/src/lib/feature/shared/strategies/in-map-resolution.ts +++ b/packages/geo/src/lib/feature/shared/strategies/in-map-resolution.ts @@ -1,9 +1,10 @@ import { EntityStoreStrategy } from '@igo2/common'; -import { FeatureStore } from '../store'; -import { FeatureStoreInMapResolutionStrategyOptions } from '../feature.interfaces'; import { Subscription, debounceTime } from 'rxjs'; +import { FeatureStoreInMapResolutionStrategyOptions } from '../feature.interfaces'; +import { FeatureStore } from '../store'; + /** * This strategy maintain the store features updated while the map is scrolled. * The features's state inside the map's resolution are tagged inMapResolution = true; diff --git a/packages/geo/src/lib/feature/shared/strategies/loading-layer.ts b/packages/geo/src/lib/feature/shared/strategies/loading-layer.ts index 784bf366e6..e1368cc078 100644 --- a/packages/geo/src/lib/feature/shared/strategies/loading-layer.ts +++ b/packages/geo/src/lib/feature/shared/strategies/loading-layer.ts @@ -1,10 +1,10 @@ -import OlEvent from 'ol/events/Event'; - import { EntityStoreStrategy } from '@igo2/common'; -import { FeatureStore } from '../store'; -import { FeatureStoreLoadingLayerStrategyOptions } from '../feature.interfaces'; +import OlEvent from 'ol/events/Event'; + import { ClusterDataSource } from '../../../datasource/shared/datasources/cluster-datasource'; +import { FeatureStoreLoadingLayerStrategyOptions } from '../feature.interfaces'; +import { FeatureStore } from '../store'; /** * This strategy loads a layer's features into it's store counterpart. diff --git a/packages/geo/src/lib/feature/shared/strategies/loading.ts b/packages/geo/src/lib/feature/shared/strategies/loading.ts index f3ae27b1f5..1e1bc44959 100644 --- a/packages/geo/src/lib/feature/shared/strategies/loading.ts +++ b/packages/geo/src/lib/feature/shared/strategies/loading.ts @@ -1,7 +1,7 @@ -import { Subscription } from 'rxjs'; - import { EntityStoreStrategy } from '@igo2/common'; +import { Subscription } from 'rxjs'; + import { FeatureMotion } from '../feature.enums'; import { Feature, diff --git a/packages/geo/src/lib/feature/shared/strategies/search.ts b/packages/geo/src/lib/feature/shared/strategies/search.ts index b88d9effc1..815c09185f 100644 --- a/packages/geo/src/lib/feature/shared/strategies/search.ts +++ b/packages/geo/src/lib/feature/shared/strategies/search.ts @@ -1,9 +1,11 @@ -import { Document, DocumentOptions } from 'flexsearch'; import { EntityStoreStrategy } from '@igo2/common'; -import { FeatureStore } from '../store'; -import { FeatureStoreSearchIndexStrategyOptions } from '../feature.interfaces'; + +import { Document, DocumentOptions } from 'flexsearch'; import { skipWhile } from 'rxjs/operators'; +import { FeatureStoreSearchIndexStrategyOptions } from '../feature.interfaces'; +import { FeatureStore } from '../store'; + /** * * This strategy loads a layer's features's properties into a searchable index. diff --git a/packages/geo/src/lib/feature/shared/strategies/selection.ts b/packages/geo/src/lib/feature/shared/strategies/selection.ts index 9273d79de2..c8454e20df 100644 --- a/packages/geo/src/lib/feature/shared/strategies/selection.ts +++ b/packages/geo/src/lib/feature/shared/strategies/selection.ts @@ -1,27 +1,26 @@ +import { EntityKey, EntityRecord, EntityStoreStrategy } from '@igo2/common'; + import OlFeature from 'ol/Feature'; +import MapBrowserPointerEvent from 'ol/MapBrowserEvent'; +import { unByKey } from 'ol/Observable'; +import { EventsKey } from 'ol/events'; import type { default as OlGeometry } from 'ol/geom/Geometry'; import OlDragBoxInteraction, { DragBoxEvent } from 'ol/interaction/DragBox'; import { DragBoxEvent as OlDragBoxEvent } from 'ol/interaction/DragBox'; -import { EventsKey } from 'ol/events'; -import MapBrowserPointerEvent from 'ol/MapBrowserEvent'; -import { unByKey } from 'ol/Observable'; import { Subscription, combineLatest } from 'rxjs'; -import { map, debounceTime, skip } from 'rxjs/operators'; - -import { EntityKey, EntityRecord, EntityStoreStrategy } from '@igo2/common'; +import { debounceTime, map, skip } from 'rxjs/operators'; import { FeatureDataSource } from '../../../datasource'; import { VectorLayer } from '../../../layer/shared/layers/vector-layer'; import { IgoMap } from '../../../map/shared/map'; import { ctrlKeyDown } from '../../../map/shared/map.utils'; - +import { FeatureMotion } from '../feature.enums'; import { Feature, FeatureStoreSelectionStrategyOptions } from '../feature.interfaces'; import { FeatureStore } from '../store'; -import { FeatureMotion } from '../feature.enums'; export class OlDragSelectInteraction extends OlDragBoxInteraction { constructor(options) { diff --git a/packages/geo/src/lib/filter/filter.module.ts b/packages/geo/src/lib/filter/filter.module.ts index de4b115cdb..736afa4036 100644 --- a/packages/geo/src/lib/filter/filter.module.ts +++ b/packages/geo/src/lib/filter/filter.module.ts @@ -1,12 +1,12 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatBadgeModule } from '@angular/material/badge'; import { MatButtonModule } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatNativeDateModule, MAT_DATE_LOCALE } from '@angular/material/core'; +import { MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatOptionModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatFormFieldModule } from '@angular/material/form-field'; @@ -23,46 +23,44 @@ import { MatTabsModule } from '@angular/material/tabs'; import { MatTooltipModule } from '@angular/material/tooltip'; import { MatTreeModule } from '@angular/material/tree'; -import { - MatDatetimepickerModule, - MatNativeDatetimeModule -} from '@mat-datetimepicker/core'; - -import { IgoLanguageModule } from '@igo2/core'; import { IgoCollapsibleModule, - IgoListModule, - IgoKeyValueModule, + IgoDOMModule, IgoEntityModule, - IgoDOMModule + IgoKeyValueModule, + IgoListModule } from '@igo2/common'; -import { IgoGeometryModule } from './../geometry/geometry.module'; +import { IgoLanguageModule } from '@igo2/core'; -import { FilterableDataSourcePipe } from './shared/filterable-datasource.pipe'; -import { IgoLayerModule } from '../layer/layer.module'; -import { TimeFilterButtonComponent } from './time-filter-button/time-filter-button.component'; -import { TimeFilterFormComponent } from './time-filter-form/time-filter-form.component'; -import { TimeFilterItemComponent } from './time-filter-item/time-filter-item.component'; -import { TimeFilterListBindingDirective } from './time-filter-list/time-filter-list-binding.directive'; -import { TimeFilterListComponent } from './time-filter-list/time-filter-list.component'; -import { TimeFilterService } from './shared/time-filter.service'; +import { + MatDatetimepickerModule, + MatNativeDatetimeModule +} from '@mat-datetimepicker/core'; +import { IgoLayerModule } from '../layer/layer.module'; +import { IgoGeometryModule } from './../geometry/geometry.module'; +import { OgcFilterButtonComponent } from './ogc-filter-button/ogc-filter-button.component'; import { OgcFilterFormComponent } from './ogc-filter-form/ogc-filter-form.component'; +import { OgcFilterSelectionComponent } from './ogc-filter-selection/ogc-filter-selection.component'; +import { OgcFilterTimeSliderComponent } from './ogc-filter-time/ogc-filter-time-slider.component'; +import { OgcFilterTimeComponent } from './ogc-filter-time/ogc-filter-time.component'; import { OgcFilterableFormComponent } from './ogc-filterable-form/ogc-filterable-form.component'; import { OgcFilterableItemComponent } from './ogc-filterable-item/ogc-filterable-item.component'; import { OgcFilterableListBindingDirective } from './ogc-filterable-list/ogc-filterable-list-binding.directive'; import { OgcFilterableListComponent } from './ogc-filterable-list/ogc-filterable-list.component'; -import { OgcFilterButtonComponent } from './ogc-filter-button/ogc-filter-button.component'; -import { OGCFilterService } from './shared/ogc-filter.service'; +import { FilterableDataSourcePipe } from './shared/filterable-datasource.pipe'; import { OGCFilterTimeService } from './shared/ogc-filter-time.service'; -import { OgcFilterSelectionComponent } from './ogc-filter-selection/ogc-filter-selection.component'; - -import { SpatialFilterTypeComponent } from './spatial-filter/spatial-filter-type/spatial-filter-type.component'; -import { SpatialFilterListComponent } from './spatial-filter/spatial-filter-list/spatial-filter-list.component'; -import { SpatialFilterItemComponent } from './spatial-filter/spatial-filter-item/spatial-filter-item.component'; +import { OGCFilterService } from './shared/ogc-filter.service'; import { SpatialFilterService } from './shared/spatial-filter.service'; -import { OgcFilterTimeComponent } from './ogc-filter-time/ogc-filter-time.component'; -import { OgcFilterTimeSliderComponent } from './ogc-filter-time/ogc-filter-time-slider.component'; +import { TimeFilterService } from './shared/time-filter.service'; +import { SpatialFilterItemComponent } from './spatial-filter/spatial-filter-item/spatial-filter-item.component'; +import { SpatialFilterListComponent } from './spatial-filter/spatial-filter-list/spatial-filter-list.component'; +import { SpatialFilterTypeComponent } from './spatial-filter/spatial-filter-type/spatial-filter-type.component'; +import { TimeFilterButtonComponent } from './time-filter-button/time-filter-button.component'; +import { TimeFilterFormComponent } from './time-filter-form/time-filter-form.component'; +import { TimeFilterItemComponent } from './time-filter-item/time-filter-item.component'; +import { TimeFilterListBindingDirective } from './time-filter-list/time-filter-list-binding.directive'; +import { TimeFilterListComponent } from './time-filter-list/time-filter-list.component'; @NgModule({ imports: [ diff --git a/packages/geo/src/lib/filter/ogc-filter-button/ogc-filter-button.component.ts b/packages/geo/src/lib/filter/ogc-filter-button/ogc-filter-button.component.ts index 2edca61775..3cf3b72027 100644 --- a/packages/geo/src/lib/filter/ogc-filter-button/ogc-filter-button.component.ts +++ b/packages/geo/src/lib/filter/ogc-filter-button/ogc-filter-button.component.ts @@ -1,15 +1,15 @@ import { + ChangeDetectionStrategy, Component, Input, - ChangeDetectionStrategy, OnInit } from '@angular/core'; import { Layer } from '../../layer/shared/layers/layer'; import { IgoMap } from '../../map/shared'; import { - OgcFilterableDataSourceOptions, - IgoOgcSelector + IgoOgcSelector, + OgcFilterableDataSourceOptions } from '../shared/ogc-filter.interface'; @Component({ diff --git a/packages/geo/src/lib/filter/ogc-filter-form/ogc-filter-form.component.ts b/packages/geo/src/lib/filter/ogc-filter-form/ogc-filter-form.component.ts index 239cb3bfe7..d290e25f4c 100644 --- a/packages/geo/src/lib/filter/ogc-filter-form/ogc-filter-form.component.ts +++ b/packages/geo/src/lib/filter/ogc-filter-form/ogc-filter-form.component.ts @@ -1,16 +1,17 @@ import { Component, Input, OnInit } from '@angular/core'; import { FloatLabelType } from '@angular/material/form-field'; + import { BehaviorSubject, Observable, of } from 'rxjs'; +import { SourceFieldsOptionsParams } from '../../datasource/shared/datasources/datasource.interface'; +import { OgcFilterWriter } from '../../filter/shared/ogc-filter'; +import { OgcFilterOperator } from '../../filter/shared/ogc-filter.enum'; import { OgcFilterableDataSource, OgcFiltersOptions } from '../../filter/shared/ogc-filter.interface'; -import { OgcFilterWriter } from '../../filter/shared/ogc-filter'; -import { WktService } from '../../wkt/shared/wkt.service'; import { IgoMap } from '../../map/shared'; -import { SourceFieldsOptionsParams } from '../../datasource/shared/datasources/datasource.interface'; -import { OgcFilterOperator } from '../../filter/shared/ogc-filter.enum'; +import { WktService } from '../../wkt/shared/wkt.service'; @Component({ selector: 'igo-ogc-filter-form', diff --git a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts index c05f82c039..1dc901713c 100644 --- a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts +++ b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts @@ -5,31 +5,32 @@ import { OnInit, ViewChild } from '@angular/core'; +import { + UntypedFormBuilder, + UntypedFormGroup, + Validators +} from '@angular/forms'; +import { MatOption } from '@angular/material/core'; +import { MatSelect } from '@angular/material/select'; -import { ConfigService } from '@igo2/core'; import { DOMService, DOMValue } from '@igo2/common'; +import { ConfigService } from '@igo2/core'; + +import { BehaviorSubject, Observable } from 'rxjs'; +import { debounceTime, map } from 'rxjs/operators'; +import { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource'; +import { OgcFilterWriter } from '../../filter/shared/ogc-filter'; import { - OgcFilterableDataSource, IgoOgcFilterObject, + OgcFilterableDataSource, OgcPushButton, OgcSelectorBundle, SelectorGroup } from '../../filter/shared/ogc-filter.interface'; -import { OgcFilterWriter } from '../../filter/shared/ogc-filter'; import { IgoMap } from '../../map/shared'; -import { OGCFilterService } from '../shared/ogc-filter.service'; -import { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource'; -import { - UntypedFormBuilder, - UntypedFormGroup, - Validators -} from '@angular/forms'; -import { debounceTime, map } from 'rxjs/operators'; import { OgcFilterOperator } from '../shared/ogc-filter.enum'; -import { MatSelect } from '@angular/material/select'; -import { MatOption } from '@angular/material/core'; -import { BehaviorSubject, Observable } from 'rxjs'; +import { OGCFilterService } from '../shared/ogc-filter.service'; @Component({ selector: 'igo-ogc-filter-selection', diff --git a/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time-slider.component.ts b/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time-slider.component.ts index d360880fbd..96e2e52735 100644 --- a/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time-slider.component.ts +++ b/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time-slider.component.ts @@ -1,15 +1,16 @@ import { Component, + EventEmitter, Input, - ViewChild, + OnInit, Output, - EventEmitter, - OnInit + ViewChild } from '@angular/core'; -import { OGCFilterTimeService } from '../shared/ogc-filter-time.service'; +import { MatSlider } from '@angular/material/slider'; import { default as moment } from 'moment'; -import { MatSlider } from '@angular/material/slider'; + +import { OGCFilterTimeService } from '../shared/ogc-filter-time.service'; @Component({ selector: 'igo-ogc-filter-time-slider', diff --git a/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time.component.ts b/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time.component.ts index ea164ef338..bb2d75eee4 100644 --- a/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time.component.ts +++ b/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time.component.ts @@ -1,23 +1,24 @@ import { Component, - Input, - ViewChild, ElementRef, - Output, EventEmitter, - OnInit + Input, + OnInit, + Output, + ViewChild } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; + +import { default as moment } from 'moment'; + import { OgcFilterOperator } from '../../filter/shared/ogc-filter.enum'; import { OGCFilterTimeService } from '../shared/ogc-filter-time.service'; import { - OgcFilterableDataSourceOptions, + OgcFilterDuringOptions, OgcFilterableDataSource, - OgcFilterDuringOptions + OgcFilterableDataSourceOptions } from '../shared/ogc-filter.interface'; -import { default as moment } from 'moment'; - @Component({ selector: 'igo-ogc-filter-time', templateUrl: './ogc-filter-time.component.html', diff --git a/packages/geo/src/lib/filter/ogc-filterable-form/ogc-filterable-form.component.ts b/packages/geo/src/lib/filter/ogc-filterable-form/ogc-filterable-form.component.ts index d7fbbe5b68..5644438354 100644 --- a/packages/geo/src/lib/filter/ogc-filterable-form/ogc-filterable-form.component.ts +++ b/packages/geo/src/lib/filter/ogc-filterable-form/ogc-filterable-form.component.ts @@ -1,8 +1,9 @@ import { Component, Input } from '@angular/core'; -import { OgcFilterableDataSource } from '../shared/ogc-filter.interface'; -import { IgoMap } from '../../map/shared'; -import { MAT_SELECT_CONFIG } from '@angular/material/select'; import { MAT_AUTOCOMPLETE_DEFAULT_OPTIONS } from '@angular/material/autocomplete'; +import { MAT_SELECT_CONFIG } from '@angular/material/select'; + +import { IgoMap } from '../../map/shared'; +import { OgcFilterableDataSource } from '../shared/ogc-filter.interface'; @Component({ selector: 'igo-ogc-filterable-form', diff --git a/packages/geo/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts b/packages/geo/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts index 439413fa26..351cd0dc44 100644 --- a/packages/geo/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts +++ b/packages/geo/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts @@ -1,19 +1,19 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { Layer } from '../../layer/shared/layers/layer'; -import { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource'; +import { BehaviorSubject, Subscription } from 'rxjs'; + import { WFSDataSourceOptionsParams } from '../../datasource/shared/datasources/wfs-datasource.interface'; +import { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource'; import { OgcFilterOperator } from '../../filter/shared/ogc-filter.enum'; - +import { Layer } from '../../layer/shared/layers/layer'; +import { IgoMap } from '../../map/shared'; +import { OgcFilterWriter } from '../shared/ogc-filter'; import { OgcFilterableDataSource, OgcFiltersOptions, OgcInterfaceFilterOptions } from '../shared/ogc-filter.interface'; import { OGCFilterService } from '../shared/ogc-filter.service'; -import { IgoMap } from '../../map/shared'; -import { OgcFilterWriter } from '../shared/ogc-filter'; -import { BehaviorSubject, Subscription } from 'rxjs'; @Component({ selector: 'igo-ogc-filterable-item', diff --git a/packages/geo/src/lib/filter/ogc-filterable-list/ogc-filterable-list-binding.directive.ts b/packages/geo/src/lib/filter/ogc-filterable-list/ogc-filterable-list-binding.directive.ts index 6b72f005c2..2fb8b6b242 100644 --- a/packages/geo/src/lib/filter/ogc-filterable-list/ogc-filterable-list-binding.directive.ts +++ b/packages/geo/src/lib/filter/ogc-filterable-list/ogc-filterable-list-binding.directive.ts @@ -1,4 +1,5 @@ -import { Directive, Self, OnInit, OnDestroy } from '@angular/core'; +import { Directive, OnDestroy, OnInit, Self } from '@angular/core'; + import { Subscription } from 'rxjs'; import { MapService } from '../../map/shared/map.service'; diff --git a/packages/geo/src/lib/filter/ogc-filterable-list/ogc-filterable-list.component.ts b/packages/geo/src/lib/filter/ogc-filterable-list/ogc-filterable-list.component.ts index fffeb61d48..dcee23f6fa 100644 --- a/packages/geo/src/lib/filter/ogc-filterable-list/ogc-filterable-list.component.ts +++ b/packages/geo/src/lib/filter/ogc-filterable-list/ogc-filterable-list.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Layer } from '../../layer/shared/layers/layer'; import { IgoMap } from '../../map/shared'; diff --git a/packages/geo/src/lib/filter/shared/filterable-datasource.pipe.ts b/packages/geo/src/lib/filter/shared/filterable-datasource.pipe.ts index 8603750df3..e5d673ac67 100644 --- a/packages/geo/src/lib/filter/shared/filterable-datasource.pipe.ts +++ b/packages/geo/src/lib/filter/shared/filterable-datasource.pipe.ts @@ -1,9 +1,8 @@ import { Pipe, PipeTransform } from '@angular/core'; +import { TimeFilterableDataSource } from '../../datasource'; import { Layer } from '../../layer/shared/layers/layer'; - import { OgcFilterableDataSource } from './ogc-filter.interface'; -import { TimeFilterableDataSource } from '../../datasource'; @Pipe({ name: 'filterableDataSource' diff --git a/packages/geo/src/lib/filter/shared/ogc-filter-time.service.ts b/packages/geo/src/lib/filter/shared/ogc-filter-time.service.ts index 25510b8e1b..7bfa5461ad 100644 --- a/packages/geo/src/lib/filter/shared/ogc-filter-time.service.ts +++ b/packages/geo/src/lib/filter/shared/ogc-filter-time.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; + import { default as moment } from 'moment'; import { OgcFilterableDataSource } from './ogc-filter.interface'; diff --git a/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts b/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts index 3eaff6cd7f..be757b512e 100644 --- a/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts +++ b/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts @@ -1,10 +1,10 @@ -import olGeometry from 'ol/geom/Geometry'; +import { DOMValue } from '@igo2/common'; + import olFormatFilter from 'ol/format/filter/Filter'; +import olGeometry from 'ol/geom/Geometry'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; import olSource from 'ol/source/Source'; import olSourceVector from 'ol/source/Vector'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; - -import { DOMValue } from '@igo2/common'; import { DataSource } from '../../datasource/shared/datasources/datasource'; import { DataSourceOptions } from '../../datasource/shared/datasources/datasource.interface'; diff --git a/packages/geo/src/lib/filter/shared/ogc-filter.ts b/packages/geo/src/lib/filter/shared/ogc-filter.ts index 73ab1d5c57..089085b1ed 100644 --- a/packages/geo/src/lib/filter/shared/ogc-filter.ts +++ b/packages/geo/src/lib/filter/shared/ogc-filter.ts @@ -1,26 +1,27 @@ -import * as olfilter from 'ol/format/filter'; -import olFormatWKT from 'ol/format/WKT'; +import { ObjectUtils, uuid } from '@igo2/utils'; + import olFormatWFS, { WriteGetFeatureOptions } from 'ol/format/WFS'; +import olFormatWKT from 'ol/format/WKT'; +import * as olfilter from 'ol/format/filter'; import olGeometry from 'ol/geom/Geometry'; - import olProjection from 'ol/proj/Projection'; -import { uuid, ObjectUtils } from '@igo2/utils'; +import { default as moment } from 'moment'; +import { SourceFieldsOptionsParams } from '../../datasource/shared/datasources/datasource.interface'; +import { OgcFilterOperator, OgcFilterOperatorType } from './ogc-filter.enum'; import { - OgcFilter, - IgoOgcFilterObject, AnyBaseOgcFilterOptions, - OgcInterfaceFilterOptions, + IgoOgcFilterObject, + IgoOgcSelector, + OgcFilter, OgcFilterableDataSourceOptions, OgcFiltersOptions, - IgoOgcSelector, - SelectorGroup, - OgcSelectorBundle + OgcInterfaceFilterOptions, + OgcSelectorBundle, + SelectorGroup } from './ogc-filter.interface'; -import { OgcFilterOperatorType, OgcFilterOperator } from './ogc-filter.enum'; -import { SourceFieldsOptionsParams } from '../../datasource/shared/datasources/datasource.interface'; -import { default as moment } from 'moment'; + export class OgcFilterWriter { private filterSequence: OgcInterfaceFilterOptions[] = []; public operators = { diff --git a/packages/geo/src/lib/filter/shared/spatial-filter.service.ts b/packages/geo/src/lib/filter/shared/spatial-filter.service.ts index bdbfa6eeb8..3a4fdc9443 100644 --- a/packages/geo/src/lib/filter/shared/spatial-filter.service.ts +++ b/packages/geo/src/lib/filter/shared/spatial-filter.service.ts @@ -1,13 +1,15 @@ +import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; import { ConfigService, LanguageService } from '@igo2/core'; -import { map } from 'rxjs/operators'; + import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; + import { Feature } from '../../feature/shared'; import { - SpatialFilterQueryType, SpatialFilterItemType, + SpatialFilterQueryType, SpatialFilterType } from './spatial-filter.enum'; import { SpatialFilterThematic } from './spatial-filter.interface'; diff --git a/packages/geo/src/lib/filter/shared/time-filter.interface.ts b/packages/geo/src/lib/filter/shared/time-filter.interface.ts index 3968aefde0..6de50e1f66 100644 --- a/packages/geo/src/lib/filter/shared/time-filter.interface.ts +++ b/packages/geo/src/lib/filter/shared/time-filter.interface.ts @@ -1,4 +1,4 @@ -import { TimeFilterType, TimeFilterStyle } from './time-filter.enum'; +import { TimeFilterStyle, TimeFilterType } from './time-filter.enum'; export interface TimeFilterOptions { min?: string; diff --git a/packages/geo/src/lib/filter/shared/time-filter.service.ts b/packages/geo/src/lib/filter/shared/time-filter.service.ts index 48a84779d5..6f1406cc70 100644 --- a/packages/geo/src/lib/filter/shared/time-filter.service.ts +++ b/packages/geo/src/lib/filter/shared/time-filter.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource'; import { TileArcGISRestDataSource } from '../../datasource/shared/datasources/tilearcgisrest-datasource'; +import { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource'; @Injectable() export class TimeFilterService { diff --git a/packages/geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.ts b/packages/geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.ts index 2733cc37a4..d638805446 100644 --- a/packages/geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.ts +++ b/packages/geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.ts @@ -1,47 +1,50 @@ -import OlFeature from 'ol/Feature'; +import { SelectionModel } from '@angular/cdk/collections'; +import { NestedTreeControl } from '@angular/cdk/tree'; import { - Component, - Input, ChangeDetectionStrategy, ChangeDetectorRef, - Output, + Component, EventEmitter, + Input, OnDestroy, - OnInit + OnInit, + Output } from '@angular/core'; -import { - SpatialFilterQueryType, - SpatialFilterType -} from '../../shared/spatial-filter.enum'; -import { SelectionModel } from '@angular/cdk/collections'; -import { IgoMap } from '../../../map/shared'; -import { SpatialFilterItemType } from './../../shared/spatial-filter.enum'; -import { Feature } from './../../../feature/shared/feature.interfaces'; import { UntypedFormControl } from '@angular/forms'; -import { BehaviorSubject, Subscription } from 'rxjs'; -import type { Type } from 'ol/geom/Geometry'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; -import { GeoJSONGeometry } from '../../../geometry/shared/geometry.interfaces'; -import * as olStyle from 'ol/style'; -import * as olproj from 'ol/proj'; -import OlPoint from 'ol/geom/Point'; import { MatTreeNestedDataSource } from '@angular/material/tree'; -import { SpatialFilterService } from '../../shared/spatial-filter.service'; -import { MeasureLengthUnit } from '../../../measure'; + import { EntityStoreFilterSelectionStrategy, EntityStoreWithStrategy, EntityTableColumnRenderer, EntityTableTemplate } from '@igo2/common'; -import { Layer, VectorLayer } from '../../../layer/shared'; -import { NestedTreeControl } from '@angular/cdk/tree'; -import { SpatialFilterThematic } from './../../shared/spatial-filter.interface'; -import { MessageService, LanguageService } from '@igo2/core'; +import { LanguageService, MessageService } from '@igo2/core'; + +import OlFeature from 'ol/Feature'; +import type { Type } from 'ol/geom/Geometry'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; +import OlPoint from 'ol/geom/Point'; +import * as olproj from 'ol/proj'; +import * as olStyle from 'ol/style'; + +import { BehaviorSubject, Subscription } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; -import { FeatureMotion, FeatureStoreSelectionStrategy } from '../../../feature'; import { FeatureDataSource } from '../../../datasource/shared'; +import { FeatureMotion, FeatureStoreSelectionStrategy } from '../../../feature'; +import { GeoJSONGeometry } from '../../../geometry/shared/geometry.interfaces'; +import { Layer, VectorLayer } from '../../../layer/shared'; +import { IgoMap } from '../../../map/shared'; +import { MeasureLengthUnit } from '../../../measure'; +import { + SpatialFilterQueryType, + SpatialFilterType +} from '../../shared/spatial-filter.enum'; +import { SpatialFilterService } from '../../shared/spatial-filter.service'; +import { Feature } from './../../../feature/shared/feature.interfaces'; +import { SpatialFilterItemType } from './../../shared/spatial-filter.enum'; +import { SpatialFilterThematic } from './../../shared/spatial-filter.interface'; /** * Spatial-Filter-Item (search parameters) diff --git a/packages/geo/src/lib/filter/spatial-filter/spatial-filter-list/spatial-filter-list.component.ts b/packages/geo/src/lib/filter/spatial-filter/spatial-filter-list/spatial-filter-list.component.ts index 2ab21d503f..ab92ed251e 100644 --- a/packages/geo/src/lib/filter/spatial-filter/spatial-filter-list/spatial-filter-list.component.ts +++ b/packages/geo/src/lib/filter/spatial-filter/spatial-filter-list/spatial-filter-list.component.ts @@ -1,25 +1,28 @@ -import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; -import { EntityStore } from '@igo2/common'; -import { SpatialFilterService } from './../../shared/spatial-filter.service'; -import { - SpatialFilterQueryType, - SpatialFilterType -} from './../../shared/spatial-filter.enum'; import { + ChangeDetectionStrategy, Component, + EventEmitter, Input, - OnInit, OnDestroy, - ChangeDetectionStrategy, - Output, - EventEmitter + OnInit, + Output } from '@angular/core'; -import { Subscription } from 'rxjs'; import { UntypedFormControl } from '@angular/forms'; -import { Feature } from '../../../feature'; -import { MeasureLengthUnit } from '../../../measure/shared'; + +import { EntityStore } from '@igo2/common'; import { MessageService } from '@igo2/core'; + +import { Subscription } from 'rxjs'; +import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; + +import { Feature } from '../../../feature'; import { Layer } from '../../../layer'; +import { MeasureLengthUnit } from '../../../measure/shared'; +import { + SpatialFilterQueryType, + SpatialFilterType +} from './../../shared/spatial-filter.enum'; +import { SpatialFilterService } from './../../shared/spatial-filter.service'; @Component({ selector: 'igo-spatial-filter-list', diff --git a/packages/geo/src/lib/filter/spatial-filter/spatial-filter-type/spatial-filter-type.component.ts b/packages/geo/src/lib/filter/spatial-filter/spatial-filter-type/spatial-filter-type.component.ts index 65c64a001e..1eba711b17 100644 --- a/packages/geo/src/lib/filter/spatial-filter/spatial-filter-type/spatial-filter-type.component.ts +++ b/packages/geo/src/lib/filter/spatial-filter/spatial-filter-type/spatial-filter-type.component.ts @@ -1,20 +1,22 @@ import { + ChangeDetectionStrategy, Component, + EventEmitter, Input, OnInit, - ChangeDetectionStrategy, - Output, - EventEmitter + Output } from '@angular/core'; -import { - SpatialFilterQueryType, - SpatialFilterType -} from '../../shared/spatial-filter.enum'; import { UntypedFormControl } from '@angular/forms'; + import { EntityStore } from '@igo2/common'; + import { Feature } from '../../../feature'; -import { MeasureLengthUnit } from '../../../measure'; import { Layer } from '../../../layer'; +import { MeasureLengthUnit } from '../../../measure'; +import { + SpatialFilterQueryType, + SpatialFilterType +} from '../../shared/spatial-filter.enum'; /** * Spatial Filter Type diff --git a/packages/geo/src/lib/filter/time-filter-button/time-filter-button.component.ts b/packages/geo/src/lib/filter/time-filter-button/time-filter-button.component.ts index 1dc453c14c..15311055c6 100644 --- a/packages/geo/src/lib/filter/time-filter-button/time-filter-button.component.ts +++ b/packages/geo/src/lib/filter/time-filter-button/time-filter-button.component.ts @@ -1,14 +1,14 @@ import { + ChangeDetectionStrategy, Component, Input, - ChangeDetectionStrategy, OnInit } from '@angular/core'; +import { TimeFilterableDataSourceOptions } from '../../datasource'; +import { WMSDataSourceOptions } from '../../datasource/shared/datasources/wms-datasource.interface'; import { Layer } from '../../layer/shared/layers/layer'; import { IgoMap } from '../../map/shared'; -import { WMSDataSourceOptions } from '../../datasource/shared/datasources/wms-datasource.interface'; -import { TimeFilterableDataSourceOptions } from '../../datasource'; @Component({ selector: 'igo-time-filter-button', diff --git a/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts b/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts index 946ec23600..59d609cc91 100644 --- a/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts +++ b/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts @@ -1,19 +1,21 @@ import { Component, - OnInit, + EventEmitter, Input, + OnInit, Output, - EventEmitter, ViewChild } from '@angular/core'; import { DateAdapter } from '@angular/material/core'; import { MatSlider } from '@angular/material/slider'; -import { default as moment } from 'moment'; + import olSourceImageWMS from 'ol/source/ImageWMS'; +import { default as moment } from 'moment'; + import { Layer } from '../../layer/shared/layers/layer'; +import { TimeFilterStyle, TimeFilterType } from '../shared/time-filter.enum'; import { TimeFilterOptions } from '../shared/time-filter.interface'; -import { TimeFilterType, TimeFilterStyle } from '../shared/time-filter.enum'; @Component({ selector: 'igo-time-filter-form', diff --git a/packages/geo/src/lib/filter/time-filter-item/time-filter-item.component.ts b/packages/geo/src/lib/filter/time-filter-item/time-filter-item.component.ts index 556cfbc816..4615a3d1a1 100644 --- a/packages/geo/src/lib/filter/time-filter-item/time-filter-item.component.ts +++ b/packages/geo/src/lib/filter/time-filter-item/time-filter-item.component.ts @@ -1,9 +1,10 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { Layer } from '../../layer/shared/layers/layer'; -import { TimeFilterService } from '../shared/time-filter.service'; import { BehaviorSubject, Subscription } from 'rxjs'; + import { TimeFilterableDataSource } from '../../datasource'; +import { Layer } from '../../layer/shared/layers/layer'; +import { TimeFilterService } from '../shared/time-filter.service'; @Component({ selector: 'igo-time-filter-item', diff --git a/packages/geo/src/lib/filter/time-filter-list/time-filter-list-binding.directive.ts b/packages/geo/src/lib/filter/time-filter-list/time-filter-list-binding.directive.ts index c4a2629229..c1ab62a94b 100644 --- a/packages/geo/src/lib/filter/time-filter-list/time-filter-list-binding.directive.ts +++ b/packages/geo/src/lib/filter/time-filter-list/time-filter-list-binding.directive.ts @@ -1,4 +1,5 @@ -import { Directive, Self, OnInit, OnDestroy } from '@angular/core'; +import { Directive, OnDestroy, OnInit, Self } from '@angular/core'; + import { Subscription } from 'rxjs'; import { MapService } from '../../map/shared/map.service'; diff --git a/packages/geo/src/lib/filter/time-filter-list/time-filter-list.component.ts b/packages/geo/src/lib/filter/time-filter-list/time-filter-list.component.ts index b1e1570ece..27e916b89c 100644 --- a/packages/geo/src/lib/filter/time-filter-list/time-filter-list.component.ts +++ b/packages/geo/src/lib/filter/time-filter-list/time-filter-list.component.ts @@ -1,8 +1,8 @@ import { - Component, - Input, ChangeDetectionStrategy, - ChangeDetectorRef + ChangeDetectorRef, + Component, + Input } from '@angular/core'; import { Layer } from '../../layer/shared/layers/layer'; diff --git a/packages/geo/src/lib/geo.module.ts b/packages/geo/src/lib/geo.module.ts index a82fede9c9..35246d2ecb 100644 --- a/packages/geo/src/lib/geo.module.ts +++ b/packages/geo/src/lib/geo.module.ts @@ -1,7 +1,8 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { IgoCatalogModule } from './catalog/catalog.module'; import { IgoDataSourceModule } from './datasource/datasource.module'; +import { IgoDirectionsModule } from './directions/directions.module'; import { IgoDownloadModule } from './download/download.module'; import { IgoDrawingToolModule } from './draw/drawingTool.module'; import { IgoFeatureModule } from './feature/feature.module'; @@ -15,12 +16,11 @@ import { IgoMetadataModule } from './metadata/metadata.module'; import { IgoOverlayModule } from './overlay/overlay.module'; import { IgoPrintModule } from './print/print.module'; import { IgoQueryModule } from './query/query.module'; -import { IgoDirectionsModule } from './directions/directions.module'; import { IgoSearchModule } from './search/search.module'; +import { IgoStyleModule } from './style/style.module'; import { IgoToastModule } from './toast/toast.module'; -import { IgoGeoWorkspaceModule } from './workspace/workspace.module'; import { IgoWktModule } from './wkt/wkt.module'; -import { IgoStyleModule } from './style/style.module'; +import { IgoGeoWorkspaceModule } from './workspace/workspace.module'; @NgModule({ imports: [], diff --git a/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field-input.component.ts b/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field-input.component.ts index 7b8593c006..43014cc8e0 100644 --- a/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field-input.component.ts +++ b/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field-input.component.ts @@ -1,48 +1,48 @@ -import { DrawControlOptions } from './../shared/controls/draw'; import { + ChangeDetectionStrategy, + ChangeDetectorRef, Component, Input, - OnInit, OnDestroy, + OnInit, Optional, - Self, - ChangeDetectorRef, - ChangeDetectionStrategy + Self } from '@angular/core'; -import { NgControl, ControlValueAccessor } from '@angular/forms'; - -import { Subscription } from 'rxjs'; +import { ControlValueAccessor, NgControl } from '@angular/forms'; -import * as OlStyle from 'ol/style'; -import { StyleLike as OlStyleLike } from 'ol/style/Style'; +import OlFeature from 'ol/Feature'; +import OlOverlay from 'ol/Overlay'; import OlGeoJSON from 'ol/format/GeoJSON'; +import OlCircle from 'ol/geom/Circle'; import OlGeometry from 'ol/geom/Geometry'; import type { Type } from 'ol/geom/Geometry'; -import OlFeature from 'ol/Feature'; -import OlVectorSource from 'ol/source/Vector'; +import OlLineString from 'ol/geom/LineString'; +import Point from 'ol/geom/Point'; +import OlPoint from 'ol/geom/Point'; +import OlPolygon from 'ol/geom/Polygon'; import OlVectorLayer from 'ol/layer/Vector'; -import OlOverlay from 'ol/Overlay'; import * as olproj from 'ol/proj'; -import Point from 'ol/geom/Point'; +import OlVectorSource from 'ol/source/Vector'; +import * as OlStyle from 'ol/style'; +import { StyleLike as OlStyleLike } from 'ol/style/Style'; + +import { Subscription } from 'rxjs'; import { IgoMap } from '../../map/shared'; import { MeasureLengthUnit, - updateOlGeometryMidpoints, formatMeasure, - measureOlGeometry + measureOlGeometry, + updateOlGeometryMidpoints } from '../../measure'; import { DrawControl, ModifyControl, ModifyControlOptions } from '../shared/controls'; -import { createDrawInteractionStyle } from '../shared/geometry.utils'; import { GeoJSONGeometry } from '../shared/geometry.interfaces'; -import OlCircle from 'ol/geom/Circle'; -import OlLineString from 'ol/geom/LineString'; -import OlPoint from 'ol/geom/Point'; -import OlPolygon from 'ol/geom/Polygon'; +import { createDrawInteractionStyle } from '../shared/geometry.utils'; +import { DrawControlOptions } from './../shared/controls/draw'; interface HasRadius { getRadius: () => number; diff --git a/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.component.ts b/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.component.ts index d675c51fe0..bf04b1b766 100644 --- a/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.component.ts +++ b/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.component.ts @@ -7,10 +7,14 @@ import { OnInit } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; + import { IgoFormFieldComponent } from '@igo2/common'; + import type { Type } from 'ol/geom/Geometry'; import { StyleLike as OlStyleLike } from 'ol/style/Style'; + import { BehaviorSubject, Subscription } from 'rxjs'; + import { IgoMap } from '../../map/shared'; import { GeoJSONGeometry } from '../shared/geometry.interfaces'; diff --git a/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.module.ts b/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.module.ts index afc23d72fc..0a1b201fa5 100644 --- a/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.module.ts +++ b/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; @@ -9,8 +9,8 @@ import { MatInputModule } from '@angular/material/input'; import { IgoLanguageModule } from '@igo2/core'; -import { GeometryFormFieldComponent } from './geometry-form-field.component'; import { GeometryFormFieldInputComponent } from './geometry-form-field-input.component'; +import { GeometryFormFieldComponent } from './geometry-form-field.component'; /** * @ignore diff --git a/packages/geo/src/lib/geometry/geometry.module.ts b/packages/geo/src/lib/geometry/geometry.module.ts index 59a15ebc96..4c1bcb045f 100644 --- a/packages/geo/src/lib/geometry/geometry.module.ts +++ b/packages/geo/src/lib/geometry/geometry.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { IgoGeometryFormFieldModule } from './geometry-form-field/geometry-form-field.module'; diff --git a/packages/geo/src/lib/geometry/shared/controls/draw.ts b/packages/geo/src/lib/geometry/shared/controls/draw.ts index 9d2da7a063..28cfc17df5 100644 --- a/packages/geo/src/lib/geometry/shared/controls/draw.ts +++ b/packages/geo/src/lib/geometry/shared/controls/draw.ts @@ -1,20 +1,20 @@ -import { EventsKey } from 'ol/events'; import OlMap from 'ol/Map'; -import { StyleLike as OlStyleLike } from 'ol/style/Style'; +import { unByKey } from 'ol/Observable'; +import { EventsKey } from 'ol/events'; +import BasicEvent from 'ol/events/Event'; +import { doubleClick } from 'ol/events/condition'; import type { Type } from 'ol/geom/Geometry'; -import OlVectorSource from 'ol/source/Vector'; -import OlVectorLayer from 'ol/layer/Vector'; -import OlDraw from 'ol/interaction/Draw'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import OlDraw from 'ol/interaction/Draw'; +import { DrawEvent as OlDrawEvent } from 'ol/interaction/Draw'; import OlModify from 'ol/interaction/Modify'; import OlSelect from 'ol/interaction/Select'; -import BasicEvent from 'ol/events/Event'; -import { DrawEvent as OlDrawEvent } from 'ol/interaction/Draw'; import { SelectEvent as OlSelectEvent } from 'ol/interaction/Select'; -import { unByKey } from 'ol/Observable'; -import { doubleClick } from 'ol/events/condition'; +import OlVectorLayer from 'ol/layer/Vector'; +import OlVectorSource from 'ol/source/Vector'; +import { StyleLike as OlStyleLike } from 'ol/style/Style'; -import { Subject, Subscription, fromEvent, BehaviorSubject } from 'rxjs'; +import { BehaviorSubject, Subject, Subscription, fromEvent } from 'rxjs'; import { getMousePositionFromOlGeometryEvent } from '../geometry.utils'; diff --git a/packages/geo/src/lib/geometry/shared/controls/modify.ts b/packages/geo/src/lib/geometry/shared/controls/modify.ts index 9045287fa4..854aed0251 100644 --- a/packages/geo/src/lib/geometry/shared/controls/modify.ts +++ b/packages/geo/src/lib/geometry/shared/controls/modify.ts @@ -1,25 +1,25 @@ -import OlMap from 'ol/Map'; import OlFeature from 'ol/Feature'; -import * as OlStyle from 'ol/style'; -import { StyleLike as OlStyleLike } from 'ol/style/Style'; -import OlVectorSource from 'ol/source/Vector'; -import OlVectorLayer from 'ol/layer/Vector'; -import OlModify from 'ol/interaction/Modify'; -import OlTranslate from 'ol/interaction/Translate'; -import OlDraw from 'ol/interaction/Draw'; -import OlPolygon from 'ol/geom/Polygon'; -import OlLineString from 'ol/geom/LineString'; +import OlMap from 'ol/Map'; +import MapBrowserEvent from 'ol/MapBrowserEvent'; +import { unByKey } from 'ol/Observable'; +import BasicEvent from 'ol/events/Event'; import OlCircle from 'ol/geom/Circle'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; +import OlLineString from 'ol/geom/LineString'; import OlLinearRing from 'ol/geom/LinearRing'; -import OlInteraction from 'ol/interaction/Interaction'; +import OlPolygon from 'ol/geom/Polygon'; import OlDragBoxInteraction from 'ol/interaction/DragBox'; -import MapBrowserEvent from 'ol/MapBrowserEvent'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; -import BasicEvent from 'ol/events/Event'; +import OlDraw from 'ol/interaction/Draw'; +import { DrawEvent as OlDrawEvent } from 'ol/interaction/Draw'; +import OlInteraction from 'ol/interaction/Interaction'; +import OlModify from 'ol/interaction/Modify'; import { ModifyEvent as OlModifyEvent } from 'ol/interaction/Modify'; +import OlTranslate from 'ol/interaction/Translate'; import { TranslateEvent as OlTranslateEvent } from 'ol/interaction/Translate'; -import { DrawEvent as OlDrawEvent } from 'ol/interaction/Draw'; -import { unByKey } from 'ol/Observable'; +import OlVectorLayer from 'ol/layer/Vector'; +import OlVectorSource from 'ol/source/Vector'; +import * as OlStyle from 'ol/style'; +import { StyleLike as OlStyleLike } from 'ol/style/Style'; import { Subject, Subscription, fromEvent } from 'rxjs'; diff --git a/packages/geo/src/lib/geometry/shared/controls/slice.ts b/packages/geo/src/lib/geometry/shared/controls/slice.ts index 5b8441b027..fd224c297f 100644 --- a/packages/geo/src/lib/geometry/shared/controls/slice.ts +++ b/packages/geo/src/lib/geometry/shared/controls/slice.ts @@ -1,10 +1,10 @@ -import OlMap from 'ol/Map'; import OlFeature from 'ol/Feature'; -import { StyleLike as OlStyleLike } from 'ol/style/Style'; -import OlVectorSource from 'ol/source/Vector'; -import OlVectorLayer from 'ol/layer/Vector'; +import OlMap from 'ol/Map'; import type { default as OlGeometry } from 'ol/geom/Geometry'; import OlLineString from 'ol/geom/LineString'; +import OlVectorLayer from 'ol/layer/Vector'; +import OlVectorSource from 'ol/source/Vector'; +import { StyleLike as OlStyleLike } from 'ol/style/Style'; import { Subject, Subscription } from 'rxjs'; diff --git a/packages/geo/src/lib/geometry/shared/geometry.interfaces.ts b/packages/geo/src/lib/geometry/shared/geometry.interfaces.ts index 0b1fbae96e..9b8ada941e 100644 --- a/packages/geo/src/lib/geometry/shared/geometry.interfaces.ts +++ b/packages/geo/src/lib/geometry/shared/geometry.interfaces.ts @@ -1,7 +1,8 @@ +import { FormFieldInputs } from '@igo2/common'; + import type { Type } from 'ol/geom/Geometry'; -import { GeoJsonGeometryTypes } from 'geojson'; -import { FormFieldInputs } from '@igo2/common'; +import { GeoJsonGeometryTypes } from 'geojson'; import { IgoMap } from '../../map/shared'; diff --git a/packages/geo/src/lib/geometry/shared/geometry.utils.ts b/packages/geo/src/lib/geometry/shared/geometry.utils.ts index 00ebc25bff..4e8990ce77 100644 --- a/packages/geo/src/lib/geometry/shared/geometry.utils.ts +++ b/packages/geo/src/lib/geometry/shared/geometry.utils.ts @@ -1,18 +1,19 @@ +import BasicEvent from 'ol/events/Event'; +import OlGeoJSON from 'ol/format/GeoJSON'; import OlCircle from 'ol/geom/Circle'; -import OlPoint from 'ol/geom/Point'; import type { default as OlGeometry } from 'ol/geom/Geometry'; -import * as olstyle from 'ol/style'; import OlLineString from 'ol/geom/LineString'; import OlLinearRing from 'ol/geom/LinearRing'; +import OlPoint from 'ol/geom/Point'; import OlPolygon from 'ol/geom/Polygon'; -import BasicEvent from 'ol/events/Event'; -import OlGeoJSON from 'ol/format/GeoJSON'; -import lineIntersect from '@turf/line-intersect'; +import * as olstyle from 'ol/style'; + import { lineString } from '@turf/helpers'; +import lineIntersect from '@turf/line-intersect'; import { - GeometrySliceMultiPolygonError, GeometrySliceLineStringError, + GeometrySliceMultiPolygonError, GeometrySliceTooManyIntersectionError } from './geometry.errors'; diff --git a/packages/geo/src/lib/import-export/export-button/export-button.component.ts b/packages/geo/src/lib/import-export/export-button/export-button.component.ts index 2343f766c0..a2dd4b96bd 100644 --- a/packages/geo/src/lib/import-export/export-button/export-button.component.ts +++ b/packages/geo/src/lib/import-export/export-button/export-button.component.ts @@ -1,9 +1,8 @@ -import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { Layer } from '../../layer/shared/layers/layer'; - -import { VectorLayer } from '../../layer/shared'; import { DataSourceOptions } from '../../datasource'; +import { VectorLayer } from '../../layer/shared'; +import { Layer } from '../../layer/shared/layers/layer'; @Component({ selector: 'igo-export-button', diff --git a/packages/geo/src/lib/import-export/import-export.module.ts b/packages/geo/src/lib/import-export/import-export.module.ts index 89db323f44..4b5645645a 100644 --- a/packages/geo/src/lib/import-export/import-export.module.ts +++ b/packages/geo/src/lib/import-export/import-export.module.ts @@ -1,7 +1,6 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; - +import { ModuleWithProviders, NgModule } from '@angular/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; import { MatOptionModule } from '@angular/material/core'; @@ -13,13 +12,13 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatTabsModule } from '@angular/material/tabs'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { IgoLanguageModule } from '@igo2/core'; import { - IgoKeyValueModule, + IgoCustomHtmlModule, IgoDrapDropModule, - IgoSpinnerModule, - IgoCustomHtmlModule + IgoKeyValueModule, + IgoSpinnerModule } from '@igo2/common'; +import { IgoLanguageModule } from '@igo2/core'; import { ExportButtonComponent } from './export-button/export-button.component'; import { ImportExportComponent } from './import-export/import-export.component'; diff --git a/packages/geo/src/lib/import-export/import-export/import-export.component.ts b/packages/geo/src/lib/import-export/import-export/import-export.component.ts index 63761286b1..e7e120fda8 100644 --- a/packages/geo/src/lib/import-export/import-export/import-export.component.ts +++ b/packages/geo/src/lib/import-export/import-export/import-export.component.ts @@ -1,67 +1,67 @@ import { + ChangeDetectorRef, Component, + EventEmitter, Input, OnDestroy, OnInit, - Output, - EventEmitter, - ChangeDetectorRef + Output } from '@angular/core'; import { - UntypedFormGroup, UntypedFormBuilder, + UntypedFormGroup, Validators } from '@angular/forms'; -import { Subscription, BehaviorSubject } from 'rxjs'; +import { MatSlideToggleChange } from '@angular/material/slide-toggle'; +import { ConfirmDialogService, EntityRecord, Workspace } from '@igo2/common'; +import type { WorkspaceStore } from '@igo2/common'; import { - MessageService, - LanguageService, ConfigService, + LanguageService, + MessageService, StorageService } from '@igo2/core'; import { strEnum } from '@igo2/utils'; -import { Feature } from '../../feature/shared/feature.interfaces'; -import { IgoMap } from '../../map/shared/map'; -import { ClusterDataSource } from '../../datasource/shared/datasources/cluster-datasource'; -import { Layer } from '../../layer/shared/layers/layer'; -import { VectorLayer } from '../../layer/shared/layers/vector-layer'; -import { AnyLayer } from '../../layer/shared/layers/any-layer'; -import { DataSourceOptions } from '../../datasource/shared/datasources/datasource.interface'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; import olPoint from 'ol/geom/Point'; import { circular } from 'ol/geom/Polygon'; +import olClusterSource from 'ol/source/Cluster'; +import olVectorSource from 'ol/source/Vector'; + +import { BehaviorSubject, Subscription } from 'rxjs'; +import { skipWhile } from 'rxjs/operators'; +import { ClusterDataSource } from '../../datasource/shared/datasources/cluster-datasource'; +import { DataSourceOptions } from '../../datasource/shared/datasources/datasource.interface'; +import { DownloadService } from '../../download/shared/download.service'; +import { Feature } from '../../feature/shared/feature.interfaces'; +import { LayerService } from '../../layer/shared/layer.service'; +import { AnyLayer } from '../../layer/shared/layers/any-layer'; +import { Layer } from '../../layer/shared/layers/layer'; +import { VectorLayer } from '../../layer/shared/layers/vector-layer'; +import { InputProjections, ProjectionsLimitationsOptions } from '../../map/'; +import { computeProjectionsConstraints } from '../../map/shared'; +import { IgoMap } from '../../map/shared/map'; +import { StyleListService } from '../../style/style-list/style-list.service'; +import { StyleService } from '../../style/style-service/style.service'; +import { EditionWorkspace } from '../../workspace/shared/edition-workspace'; +import { FeatureWorkspace } from '../../workspace/shared/feature-workspace'; +import { WfsWorkspace } from '../../workspace/shared/wfs-workspace'; +import { ExportOptions } from '../shared/export.interface'; +import { ExportService } from '../shared/export.service'; +import { EncodingFormat, ExportFormat } from '../shared/export.type'; import { handleFileExportError, handleFileExportSuccess } from '../shared/export.utils'; -import { ExportOptions } from '../shared/export.interface'; -import { ExportFormat, EncodingFormat } from '../shared/export.type'; -import { ExportService } from '../shared/export.service'; +import { ImportExportServiceOptions } from '../shared/import.interface'; import { ImportService } from '../shared/import.service'; import { - handleFileImportSuccess, - handleFileImportError + handleFileImportError, + handleFileImportSuccess } from '../shared/import.utils'; -import { StyleService } from '../../style/style-service/style.service'; -import { StyleListService } from '../../style/style-list/style-list.service'; -import { skipWhile } from 'rxjs/operators'; -import { ConfirmDialogService, EntityRecord, Workspace } from '@igo2/common'; -import type { WorkspaceStore } from '@igo2/common'; -import { WfsWorkspace } from '../../workspace/shared/wfs-workspace'; -import { EditionWorkspace } from '../../workspace/shared/edition-workspace'; -import { FeatureWorkspace } from '../../workspace/shared/feature-workspace'; -import { MatSlideToggleChange } from '@angular/material/slide-toggle'; -import { InputProjections, ProjectionsLimitationsOptions } from '../../map/'; -import { DownloadService } from '../../download/shared/download.service'; -import { computeProjectionsConstraints } from '../../map/shared'; - -import olVectorSource from 'ol/source/Vector'; -import olClusterSource from 'ol/source/Cluster'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; -import { LayerService } from '../../layer/shared/layer.service'; -import { ImportExportServiceOptions } from '../shared/import.interface'; @Component({ selector: 'igo-import-export', diff --git a/packages/geo/src/lib/import-export/shared/drop-geo-file.directive.ts b/packages/geo/src/lib/import-export/shared/drop-geo-file.directive.ts index bb6b33b8d6..75662d1175 100644 --- a/packages/geo/src/lib/import-export/shared/drop-geo-file.directive.ts +++ b/packages/geo/src/lib/import-export/shared/drop-geo-file.directive.ts @@ -1,30 +1,30 @@ import { Directive, - HostListener, EventEmitter, - OnInit, + HostListener, + Input, OnDestroy, - Input + OnInit } from '@angular/core'; -import { BehaviorSubject, Subscription } from 'rxjs'; - -import { MessageService, ConfigService } from '@igo2/core'; import { ConfirmDialogService, DragAndDropDirective } from '@igo2/common'; +import { ConfigService, MessageService } from '@igo2/core'; + +import { BehaviorSubject, Subscription } from 'rxjs'; +import { concatMap, first, skipWhile } from 'rxjs/operators'; import { Feature } from '../../feature/shared/feature.interfaces'; -import { IgoMap } from '../../map/shared/map'; +import { LayerService } from '../../layer/shared/layer.service'; import { MapBrowserComponent } from '../../map/map-browser/map-browser.component'; -import { ImportService } from './import.service'; +import { IgoMap } from '../../map/shared/map'; +import { StyleListService } from '../../style/style-list/style-list.service'; +import { StyleService } from '../../style/style-service/style.service'; import { - handleFileImportSuccess, - handleFileImportError + handleFileImportError, + handleFileImportSuccess } from '../shared/import.utils'; -import { StyleService } from '../../style/style-service/style.service'; -import { StyleListService } from '../../style/style-list/style-list.service'; -import { concatMap, first, skipWhile } from 'rxjs/operators'; -import { LayerService } from '../../layer/shared/layer.service'; import { ImportExportServiceOptions } from './import.interface'; +import { ImportService } from './import.service'; @Directive({ selector: '[igoDropGeoFile]' diff --git a/packages/geo/src/lib/import-export/shared/export.interface.ts b/packages/geo/src/lib/import-export/shared/export.interface.ts index 139e541df3..38f67868f5 100644 --- a/packages/geo/src/lib/import-export/shared/export.interface.ts +++ b/packages/geo/src/lib/import-export/shared/export.interface.ts @@ -1,4 +1,4 @@ -import { ExportFormat, EncodingFormat } from './export.type'; +import { EncodingFormat, ExportFormat } from './export.type'; export interface ExportOptions { format?: ExportFormat; diff --git a/packages/geo/src/lib/import-export/shared/export.service.ts b/packages/geo/src/lib/import-export/shared/export.service.ts index f8fd2543db..b30100b4e1 100644 --- a/packages/geo/src/lib/import-export/shared/export.service.ts +++ b/packages/geo/src/lib/import-export/shared/export.service.ts @@ -3,19 +3,18 @@ import { Injectable } from '@angular/core'; import { ConfigService } from '@igo2/core'; import { downloadContent } from '@igo2/utils'; -import { Observable, Observer } from 'rxjs'; - -import * as olformat from 'ol/format'; import OlFeature from 'ol/Feature'; +import * as olformat from 'ol/format'; import type { default as OlGeometry } from 'ol/geom/Geometry'; -import { encode } from 'windows-1252'; -import { ExportFormat, EncodingFormat } from './export.type'; +import { Observable, Observer } from 'rxjs'; +import { encode } from 'windows-1252'; import { ExportInvalidFileError, ExportNothingToExportError } from './export.errors'; +import { EncodingFormat, ExportFormat } from './export.type'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/import-export/shared/export.utils.ts b/packages/geo/src/lib/import-export/shared/export.utils.ts index 03abbdd8bf..c7d7a19404 100644 --- a/packages/geo/src/lib/import-export/shared/export.utils.ts +++ b/packages/geo/src/lib/import-export/shared/export.utils.ts @@ -1,7 +1,7 @@ import { - getEntityProperty, EntityTableColumn, - EntityTableColumnRenderer + EntityTableColumnRenderer, + getEntityProperty } from '@igo2/common'; import { MessageService } from '@igo2/core'; import { downloadContent } from '@igo2/utils'; diff --git a/packages/geo/src/lib/import-export/shared/import.service.ts b/packages/geo/src/lib/import-export/shared/import.service.ts index c5322f0dd8..dcdfe2454d 100644 --- a/packages/geo/src/lib/import-export/shared/import.service.ts +++ b/packages/geo/src/lib/import-export/shared/import.service.ts @@ -1,25 +1,25 @@ -import { Injectable } from '@angular/core'; import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { Injectable } from '@angular/core'; import { ConfigService } from '@igo2/core'; import { uuid } from '@igo2/utils'; -import { Observable, Observer } from 'rxjs'; - -import * as olformat from 'ol/format'; 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 { Feature } from '../../feature/shared/feature.interfaces'; import { ImportInvalidFileError, - ImportUnreadableFileError, - ImportSizeError, + ImportOgreServerError, ImportSRSError, - ImportOgreServerError + ImportSizeError, + ImportUnreadableFileError } from './import.errors'; -import { computeLayerTitleFromFile, getFileExtension } from './import.utils'; import { ImportExportServiceOptions } from './import.interface'; +import { computeLayerTitleFromFile, getFileExtension } from './import.utils'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/import-export/shared/import.utils.ts b/packages/geo/src/lib/import-export/shared/import.utils.ts index ac0cc79127..bbd332e714 100644 --- a/packages/geo/src/lib/import-export/shared/import.utils.ts +++ b/packages/geo/src/lib/import-export/shared/import.utils.ts @@ -1,30 +1,31 @@ +import { ConfirmDialogService } from '@igo2/common'; import { MessageService } from '@igo2/core'; +import { uuid } from '@igo2/utils'; + +import { first, of } from 'rxjs'; +import { ClusterDataSource } from '../../datasource/shared/datasources/cluster-datasource'; +import { ClusterDataSourceOptions } from '../../datasource/shared/datasources/cluster-datasource.interface'; import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource'; import { FeatureDataSourceOptions } from '../../datasource/shared/datasources/feature-datasource.interface'; import { Feature } from '../../feature/shared/feature.interfaces'; import { + computeOlFeaturesExtent, featureToOl, - moveToOlFeatures, - computeOlFeaturesExtent + moveToOlFeatures } from '../../feature/shared/feature.utils'; +import { ClusterParam } from '../../layer/shared/clusterParam'; +import { LayerService } from '../../layer/shared/layer.service'; import { VectorLayer } from '../../layer/shared/layers/vector-layer'; import { IgoMap } from '../../map/shared/map'; import { QueryableDataSourceOptions } from '../../query/shared/query.interfaces'; -import { StyleService } from '../../style/style-service/style.service'; -import { StyleByAttribute } from '../../style/shared/vector/vector-style.interface'; -import { StyleListService } from '../../style/style-list/style-list.service'; -import { ClusterParam } from '../../layer/shared/clusterParam'; -import { ClusterDataSource } from '../../datasource/shared/datasources/cluster-datasource'; -import { ClusterDataSourceOptions } from '../../datasource/shared/datasources/cluster-datasource.interface'; -import { uuid } from '@igo2/utils'; import { featureRandomStyle, featureRandomStyleFunction } from '../../style/shared/feature/feature-style'; -import { LayerService } from '../../layer/shared/layer.service'; -import { ConfirmDialogService } from '@igo2/common'; -import { first, of } from 'rxjs'; +import { StyleByAttribute } from '../../style/shared/vector/vector-style.interface'; +import { StyleListService } from '../../style/style-list/style-list.service'; +import { StyleService } from '../../style/style-service/style.service'; export function addLayerAndFeaturesToMap( features: Feature[], diff --git a/packages/geo/src/lib/layer/layer-item/layer-item.component.ts b/packages/geo/src/lib/layer/layer-item/layer-item.component.ts index eff347b45c..42d4b4e811 100644 --- a/packages/geo/src/lib/layer/layer-item/layer-item.component.ts +++ b/packages/geo/src/lib/layer/layer-item/layer-item.component.ts @@ -1,21 +1,23 @@ import { + ChangeDetectionStrategy, + ChangeDetectorRef, Component, + ElementRef, + EventEmitter, Input, - OnInit, OnDestroy, - ChangeDetectionStrategy, + OnInit, Output, - EventEmitter, - Renderer2, - ElementRef, - ChangeDetectorRef + Renderer2 } from '@angular/core'; -import { Subscription, BehaviorSubject } from 'rxjs'; + +import { ConnectionState, NetworkService } from '@igo2/core'; + +import { BehaviorSubject, Subscription } from 'rxjs'; import { MetadataLayerOptions } from '../../metadata/shared/metadata.interface'; import { layerIsQueryable } from '../../query/shared/query.utils'; import { Layer, TooltipType } from '../shared/layers'; -import { NetworkService, ConnectionState } from '@igo2/core'; @Component({ selector: 'igo-layer-item', diff --git a/packages/geo/src/lib/layer/layer-legend-item/layer-legend-item.component.ts b/packages/geo/src/lib/layer/layer-legend-item/layer-legend-item.component.ts index 639e0a21d8..d0987c39ab 100644 --- a/packages/geo/src/lib/layer/layer-legend-item/layer-legend-item.component.ts +++ b/packages/geo/src/lib/layer/layer-legend-item/layer-legend-item.component.ts @@ -1,15 +1,17 @@ import { + ChangeDetectionStrategy, Component, Input, - OnInit, OnDestroy, - ChangeDetectionStrategy + OnInit } from '@angular/core'; -import { Subscription, BehaviorSubject } from 'rxjs'; + +import { ConnectionState, NetworkService } from '@igo2/core'; + +import { BehaviorSubject, Subscription } from 'rxjs'; import { MetadataLayerOptions } from '../../metadata/shared/metadata.interface'; import { Layer, TooltipType } from '../shared/layers'; -import { NetworkService, ConnectionState } from '@igo2/core'; @Component({ selector: 'igo-layer-legend-item', diff --git a/packages/geo/src/lib/layer/layer-legend-list/layer-legend-list-binding.directive.ts b/packages/geo/src/lib/layer/layer-legend-list/layer-legend-list-binding.directive.ts index dd992be54e..243a71cf01 100644 --- a/packages/geo/src/lib/layer/layer-legend-list/layer-legend-list-binding.directive.ts +++ b/packages/geo/src/lib/layer/layer-legend-list/layer-legend-list-binding.directive.ts @@ -1,9 +1,10 @@ -import { Directive, Self, OnInit, OnDestroy } from '@angular/core'; +import { Directive, OnDestroy, OnInit, Self } from '@angular/core'; + import { Subscription, combineLatest } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; import { MapService } from '../../map/shared/map.service'; import { Layer } from '../shared/layers/layer'; -import { debounceTime } from 'rxjs/operators'; import { LayerLegendListComponent } from './layer-legend-list.component'; @Directive({ diff --git a/packages/geo/src/lib/layer/layer-legend-list/layer-legend-list.component.ts b/packages/geo/src/lib/layer/layer-legend-list/layer-legend-list.component.ts index 44ecee01e6..45d314772e 100644 --- a/packages/geo/src/lib/layer/layer-legend-list/layer-legend-list.component.ts +++ b/packages/geo/src/lib/layer/layer-legend-list/layer-legend-list.component.ts @@ -1,22 +1,24 @@ import { + ChangeDetectionStrategy, Component, + EventEmitter, Input, - ChangeDetectionStrategy, - OnInit, OnDestroy, - EventEmitter, + OnInit, Output } from '@angular/core'; -import { Layer } from '../shared'; + import { BehaviorSubject, + EMPTY, ReplaySubject, Subscription, - EMPTY, timer } from 'rxjs'; import { debounce } from 'rxjs/operators'; +import { Layer } from '../shared'; + @Component({ selector: 'igo-layer-legend-list', templateUrl: './layer-legend-list.component.html', diff --git a/packages/geo/src/lib/layer/layer-legend/layer-legend.component.ts b/packages/geo/src/lib/layer/layer-legend/layer-legend.component.ts index 71ad2fda7a..f33e4e8878 100644 --- a/packages/geo/src/lib/layer/layer-legend/layer-legend.component.ts +++ b/packages/geo/src/lib/layer/layer-legend/layer-legend.component.ts @@ -1,29 +1,30 @@ import { HttpClient } from '@angular/common/http'; import { + ChangeDetectionStrategy, + ChangeDetectorRef, Component, + ElementRef, Input, - OnInit, OnDestroy, - ChangeDetectionStrategy, - ViewChildren, - ElementRef, - ChangeDetectorRef + OnInit, + ViewChildren } from '@angular/core'; import type { QueryList } from '@angular/core'; -import { Subscription, BehaviorSubject, of, Observable } from 'rxjs'; +import { SecureImagePipe } from '@igo2/common'; +import { ConfigService, LanguageService } from '@igo2/core'; +import { BehaviorSubject, Observable, Subscription, of } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; + +import { WMSDataSource, WMSDataSourceOptions } from '../../datasource'; +import { CapabilitiesService } from '../../datasource/shared/capabilities.service'; import { Legend } from '../../datasource/shared/datasources/datasource.interface'; import { Layer } from '../shared/layers'; import { - LegendMapViewOptions, - ItemStyleOptions + ItemStyleOptions, + LegendMapViewOptions } from '../shared/layers/legend.interface'; -import { CapabilitiesService } from '../../datasource/shared/capabilities.service'; -import { catchError, map } from 'rxjs/operators'; -import { LanguageService, ConfigService } from '@igo2/core'; -import { WMSDataSource, WMSDataSourceOptions } from '../../datasource'; -import { SecureImagePipe } from '@igo2/common'; @Component({ selector: 'igo-layer-legend', diff --git a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.ts b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.ts index 8bcec3ab24..925b7e203b 100644 --- a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.ts +++ b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.ts @@ -1,14 +1,16 @@ import { + ChangeDetectionStrategy, Component, + EventEmitter, Input, - ChangeDetectionStrategy, + OnDestroy, OnInit, - EventEmitter, - Output, - OnDestroy + Output } from '@angular/core'; import { FloatLabelType } from '@angular/material/form-field'; + import { BehaviorSubject, Subscription } from 'rxjs'; + import { LayerListControlsOptions } from './layer-list-tool.interface'; @Component({ diff --git a/packages/geo/src/lib/layer/layer-list/layer-list-binding.directive.ts b/packages/geo/src/lib/layer/layer-list/layer-list-binding.directive.ts index 9b13e9f3df..cec52488d4 100644 --- a/packages/geo/src/lib/layer/layer-list/layer-list-binding.directive.ts +++ b/packages/geo/src/lib/layer/layer-list/layer-list-binding.directive.ts @@ -1,11 +1,13 @@ -import { Directive, Self, OnInit, OnDestroy, Optional } from '@angular/core'; -import { Subscription, combineLatest } from 'rxjs'; +import { Directive, OnDestroy, OnInit, Optional, Self } from '@angular/core'; import { RouteService } from '@igo2/core'; + +import { Subscription, combineLatest } from 'rxjs'; +import { debounceTime, map } from 'rxjs/operators'; + import { MapService } from '../../map/shared/map.service'; -import { LayerListComponent } from './layer-list.component'; import { Layer } from '../shared/layers/layer'; -import { map, debounceTime } from 'rxjs/operators'; +import { LayerListComponent } from './layer-list.component'; @Directive({ selector: '[igoLayerListBinding]' diff --git a/packages/geo/src/lib/layer/layer-list/layer-list.component.ts b/packages/geo/src/lib/layer/layer-list/layer-list.component.ts index 622533cbb9..285c765280 100644 --- a/packages/geo/src/lib/layer/layer-list/layer-list.component.ts +++ b/packages/geo/src/lib/layer/layer-list/layer-list.component.ts @@ -1,46 +1,47 @@ import { - Component, - Input, ChangeDetectionStrategy, + Component, ContentChild, - OnInit, - OnDestroy, - Output, + ElementRef, EventEmitter, - ElementRef + Input, + OnDestroy, + OnInit, + Output } from '@angular/core'; import type { TemplateRef } from '@angular/core'; +import { FloatLabelType } from '@angular/material/form-field'; +import { MatSliderChange } from '@angular/material/slider'; -import scrollIntoView from 'scroll-into-view-if-needed'; +import * as olextent from 'ol/extent'; -import { FloatLabelType } from '@angular/material/form-field'; -import { - LayerListControlsEnum, - LayerListDisplacement -} from './layer-list.enum'; -import { LayerListSelectVisibleEnum } from './layer-list.enum'; import { BehaviorSubject, + EMPTY, ReplaySubject, Subscription, - EMPTY, timer } from 'rxjs'; import { debounce } from 'rxjs/operators'; +import scrollIntoView from 'scroll-into-view-if-needed'; + import { - MetadataOptions, - MetadataLayerOptions + getAllChildLayersByProperty, + getRootParentByProperty +} from '../../map/shared/linkedLayers.utils'; +import { IgoMap } from '../../map/shared/map'; +import { + MetadataLayerOptions, + MetadataOptions } from '../../metadata/shared/metadata.interface'; import { LayerListControlsOptions } from '../layer-list-tool/layer-list-tool.interface'; -import { IgoMap } from '../../map/shared/map'; import { Layer } from '../shared/layers/layer'; import { LinkedProperties } from '../shared/layers/layer.interface'; -import { MatSliderChange } from '@angular/material/slider'; -import * as olextent from 'ol/extent'; import { - getAllChildLayersByProperty, - getRootParentByProperty -} from '../../map/shared/linkedLayers.utils'; + LayerListControlsEnum, + LayerListDisplacement +} from './layer-list.enum'; +import { LayerListSelectVisibleEnum } from './layer-list.enum'; // TODO: This class could use a clean up. Also, some methods could be moved ealsewhere @Component({ diff --git a/packages/geo/src/lib/layer/layer.module.ts b/packages/geo/src/lib/layer/layer.module.ts index e42af4af6b..0b249b0115 100644 --- a/packages/geo/src/lib/layer/layer.module.ts +++ b/packages/geo/src/lib/layer/layer.module.ts @@ -1,5 +1,5 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatBadgeModule } from '@angular/material/badge'; import { MatButtonModule } from '@angular/material/button'; @@ -15,28 +15,28 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatSliderModule } from '@angular/material/slider'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { IgoLanguageModule } from '@igo2/core'; import { - IgoListModule, IgoCollapsibleModule, + IgoCustomHtmlModule, IgoImageModule, - IgoPanelModule, + IgoListModule, IgoMatBadgeIconModule, - IgoCustomHtmlModule + IgoPanelModule } from '@igo2/common'; +import { IgoLanguageModule } from '@igo2/core'; -import { LayerService } from './shared/layer.service'; import { StyleService } from '../style/style-service/style.service'; -import { LayerListToolService } from './layer-list-tool/layer-list-tool.service'; import { LayerItemComponent } from './layer-item/layer-item.component'; +import { LayerLegendItemComponent } from './layer-legend-item/layer-legend-item.component'; +import { LayerLegendListBindingDirective } from './layer-legend-list/layer-legend-list-binding.directive'; +import { LayerLegendListComponent } from './layer-legend-list/layer-legend-list.component'; import { LayerLegendComponent } from './layer-legend/layer-legend.component'; -import { LayerListComponent } from './layer-list/layer-list.component'; import { LayerListToolComponent } from './layer-list-tool/layer-list-tool.component'; +import { LayerListToolService } from './layer-list-tool/layer-list-tool.service'; import { LayerListBindingDirective } from './layer-list/layer-list-binding.directive'; -import { LayerLegendListBindingDirective } from './layer-legend-list/layer-legend-list-binding.directive'; +import { LayerListComponent } from './layer-list/layer-list.component'; +import { LayerService } from './shared/layer.service'; import { TrackFeatureButtonComponent } from './track-feature-button/track-feature-button.component'; -import { LayerLegendListComponent } from './layer-legend-list/layer-legend-list.component'; -import { LayerLegendItemComponent } from './layer-legend-item/layer-legend-item.component'; @NgModule({ imports: [ diff --git a/packages/geo/src/lib/layer/shared/layer.service.ts b/packages/geo/src/lib/layer/shared/layer.service.ts index 53345ae783..2a22132a58 100644 --- a/packages/geo/src/lib/layer/shared/layer.service.ts +++ b/packages/geo/src/lib/layer/shared/layer.service.ts @@ -1,55 +1,54 @@ -import { Injectable, Optional } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { combineLatest, Observable, of } from 'rxjs'; -import { map, catchError, concatMap } from 'rxjs/operators'; -import { stylefunction } from 'ol-mapbox-style'; +import { Injectable, Optional } from '@angular/core'; + import { AuthInterceptor } from '@igo2/auth'; +import { MessageService } from '@igo2/core'; import { ObjectUtils } from '@igo2/utils'; -import olLayerVectorTile from 'ol/layer/VectorTile'; +import olLayerVectorTile from 'ol/layer/VectorTile'; import { Style } from 'ol/style'; import * as olStyle from 'ol/style'; +import { StyleLike as OlStyleLike } from 'ol/style/Style'; + +import { stylefunction } from 'ol-mapbox-style'; +import { Observable, combineLatest, of } from 'rxjs'; +import { catchError, concatMap, map } from 'rxjs/operators'; import { - OSMDataSource, + ArcGISRestDataSource, + CartoDataSource, + ClusterDataSource, FeatureDataSource, - XYZDataSource, + ImageArcGISRestDataSource, + MVTDataSource, + OSMDataSource, + TileArcGISRestDataSource, TileDebugDataSource, WFSDataSource, - WMTSDataSource, WMSDataSource, - CartoDataSource, - ImageArcGISRestDataSource, - ArcGISRestDataSource, - TileArcGISRestDataSource, + WMTSDataSource, WebSocketDataSource, - MVTDataSource, - ClusterDataSource + XYZDataSource } from '../../datasource'; - import { DataSourceService } from '../../datasource/shared/datasource.service'; - +import { LayerDBService } from '../../offline/layerDB/layerDB.service'; +import { GeoNetworkService } from '../../offline/shared/geo-network.service'; +import { StyleService } from '../../style/style-service/style.service'; +import { computeMVTOptionsOnHover } from '../utils/layer.utils'; import { - Layer, + AnyLayerOptions, ImageLayer, ImageLayerOptions, + Layer, + LayerOptions, TileLayer, TileLayerOptions, VectorLayer, VectorLayerOptions, - AnyLayerOptions, VectorTileLayer, - VectorTileLayerOptions, - LayerOptions + VectorTileLayerOptions } from './layers'; -import { computeMVTOptionsOnHover } from '../utils/layer.utils'; -import { StyleService } from '../../style/style-service/style.service'; -import { MessageService } from '@igo2/core'; -import { GeoNetworkService } from '../../offline/shared/geo-network.service'; -import { StyleLike as OlStyleLike } from 'ol/style/Style'; -import { LayerDBService } from '../../offline/layerDB/layerDB.service'; - @Injectable({ providedIn: 'root' }) diff --git a/packages/geo/src/lib/layer/shared/layers/any-layer.interface.ts b/packages/geo/src/lib/layer/shared/layers/any-layer.interface.ts index 66e5409695..c368a0a9bd 100644 --- a/packages/geo/src/lib/layer/shared/layers/any-layer.interface.ts +++ b/packages/geo/src/lib/layer/shared/layers/any-layer.interface.ts @@ -1,5 +1,5 @@ -import { LayerOptions } from './layer.interface'; import { ImageLayerOptions } from './image-layer.interface'; +import { LayerOptions } from './layer.interface'; import { TileLayerOptions } from './tile-layer.interface'; import { VectorLayerOptions } from './vector-layer.interface'; import { VectorTileLayerOptions } from './vectortile-layer.interface'; diff --git a/packages/geo/src/lib/layer/shared/layers/any-layer.ts b/packages/geo/src/lib/layer/shared/layers/any-layer.ts index f4831d8c77..03045dcf5a 100644 --- a/packages/geo/src/lib/layer/shared/layers/any-layer.ts +++ b/packages/geo/src/lib/layer/shared/layers/any-layer.ts @@ -1,5 +1,5 @@ -import { Layer } from './layer'; import { ImageLayer } from './image-layer'; +import { Layer } from './layer'; import { TileLayer } from './tile-layer'; import { VectorLayer } from './vector-layer'; import { VectorTileLayer } from './vectortile-layer'; diff --git a/packages/geo/src/lib/layer/shared/layers/image-layer.interface.ts b/packages/geo/src/lib/layer/shared/layers/image-layer.interface.ts index 25179a8a87..014c11b5f1 100644 --- a/packages/geo/src/lib/layer/shared/layers/image-layer.interface.ts +++ b/packages/geo/src/lib/layer/shared/layers/image-layer.interface.ts @@ -1,12 +1,11 @@ import olLayerImage from 'ol/layer/Image'; import olSourceImage from 'ol/source/Image'; -import { LayerOptions } from './layer.interface'; - -import { WMSDataSource } from '../../../datasource/shared/datasources/wms-datasource'; -import { WMSDataSourceOptions } from '../../../datasource/shared/datasources/wms-datasource.interface'; import { ImageArcGISRestDataSource } from '../../../datasource/shared/datasources/imagearcgisrest-datasource'; import { ArcGISRestImageDataSourceOptions } from '../../../datasource/shared/datasources/imagearcgisrest-datasource.interface'; +import { WMSDataSource } from '../../../datasource/shared/datasources/wms-datasource'; +import { WMSDataSourceOptions } from '../../../datasource/shared/datasources/wms-datasource.interface'; +import { LayerOptions } from './layer.interface'; export interface ImageLayerOptions extends LayerOptions { source?: WMSDataSource | ImageArcGISRestDataSource; diff --git a/packages/geo/src/lib/layer/shared/layers/image-layer.ts b/packages/geo/src/lib/layer/shared/layers/image-layer.ts index 1b6e050897..10ff32514e 100644 --- a/packages/geo/src/lib/layer/shared/layers/image-layer.ts +++ b/packages/geo/src/lib/layer/shared/layers/image-layer.ts @@ -1,17 +1,15 @@ -import olLayerImage from 'ol/layer/Image'; -import olSourceImage from 'ol/source/Image'; - import { AuthInterceptor } from '@igo2/auth'; +import { MessageService } from '@igo2/core'; -import { ImageWatcher } from '../../utils'; -import { IgoMap } from '../../../map/shared'; +import olLayerImage from 'ol/layer/Image'; +import olSourceImage from 'ol/source/Image'; +import { ImageArcGISRestDataSource } from '../../../datasource/shared/datasources/imagearcgisrest-datasource'; import { WMSDataSource } from '../../../datasource/shared/datasources/wms-datasource'; - -import { Layer } from './layer'; +import { IgoMap } from '../../../map/shared'; +import { ImageWatcher } from '../../utils'; import { ImageLayerOptions } from './image-layer.interface'; -import { ImageArcGISRestDataSource } from '../../../datasource/shared/datasources/imagearcgisrest-datasource'; -import { MessageService } from '@igo2/core'; +import { Layer } from './layer'; export class ImageLayer extends Layer { public declare dataSource: WMSDataSource | ImageArcGISRestDataSource; diff --git a/packages/geo/src/lib/layer/shared/layers/layer.interface.ts b/packages/geo/src/lib/layer/shared/layers/layer.interface.ts index 5c73e7e8d2..11b48831a6 100644 --- a/packages/geo/src/lib/layer/shared/layers/layer.interface.ts +++ b/packages/geo/src/lib/layer/shared/layers/layer.interface.ts @@ -1,9 +1,10 @@ +import { Message } from '@igo2/core'; + import olLayer from 'ol/layer/Layer'; import olSource from 'ol/source/Source'; -import { Message } from '@igo2/core'; -import { DataSource } from '../../../datasource/shared/datasources/datasource'; import { AnyDataSourceOptions } from '../../../datasource/shared/datasources/any-datasource.interface'; +import { DataSource } from '../../../datasource/shared/datasources/datasource'; import { MapExtent } from '../../../map/shared/map.interface'; import { LegendOptions } from './legend.interface'; diff --git a/packages/geo/src/lib/layer/shared/layers/layer.ts b/packages/geo/src/lib/layer/shared/layers/layer.ts index 33836a7c68..73a4c92546 100644 --- a/packages/geo/src/lib/layer/shared/layers/layer.ts +++ b/packages/geo/src/lib/layer/shared/layers/layer.ts @@ -1,3 +1,10 @@ +import { AuthInterceptor } from '@igo2/auth'; +import { Message, MessageService } from '@igo2/core'; +import { SubjectStatus } from '@igo2/utils'; + +import olLayer from 'ol/layer/Layer'; +import olSource from 'ol/source/Source'; + import { BehaviorSubject, Observable, @@ -7,20 +14,12 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import olLayer from 'ol/layer/Layer'; -import olSource from 'ol/source/Source'; - -import { AuthInterceptor } from '@igo2/auth'; -import { SubjectStatus } from '@igo2/utils'; - import { DataSource, Legend } from '../../../datasource'; +import { MapBase } from '../../../map/shared/map.abstract'; import { getResolutionFromScale } from '../../../map/shared/map.utils'; - -import { LayerOptions } from './layer.interface'; -import { Message, MessageService } from '@igo2/core'; import { GeoDBService } from '../../../offline/geoDB/geoDB.service'; import { LayerDBService } from '../../../offline/layerDB/layerDB.service'; -import { MapBase } from '../../../map/shared/map.abstract'; +import { LayerOptions } from './layer.interface'; export abstract class Layer { public collapsed: boolean; diff --git a/packages/geo/src/lib/layer/shared/layers/tile-layer.interface.ts b/packages/geo/src/lib/layer/shared/layers/tile-layer.interface.ts index 8774f30647..cb296d1729 100644 --- a/packages/geo/src/lib/layer/shared/layers/tile-layer.interface.ts +++ b/packages/geo/src/lib/layer/shared/layers/tile-layer.interface.ts @@ -1,21 +1,19 @@ import olLayerTile from 'ol/layer/Tile'; import olSourceTile from 'ol/source/Tile'; -import { LayerOptions } from './layer.interface'; - -import { OSMDataSource } from '../../../datasource/shared/datasources/osm-datasource'; -import { WMTSDataSource } from '../../../datasource/shared/datasources/wmts-datasource'; -import { XYZDataSource } from '../../../datasource/shared/datasources/xyz-datasource'; import { CartoDataSource } from '../../../datasource/shared/datasources/carto-datasource'; +import { CartoDataSourceOptions } from '../../../datasource/shared/datasources/carto-datasource.interface'; +import { OSMDataSource } from '../../../datasource/shared/datasources/osm-datasource'; +import { OSMDataSourceOptions } from '../../../datasource/shared/datasources/osm-datasource.interface'; import { TileArcGISRestDataSource } from '../../../datasource/shared/datasources/tilearcgisrest-datasource'; +import { TileArcGISRestDataSourceOptions } from '../../../datasource/shared/datasources/tilearcgisrest-datasource.interface'; import { TileDebugDataSource } from '../../../datasource/shared/datasources/tiledebug-datasource'; - -import { OSMDataSourceOptions } from '../../../datasource/shared/datasources/osm-datasource.interface'; +import { TileDebugDataSourceOptions } from '../../../datasource/shared/datasources/tiledebug-datasource.interface'; +import { WMTSDataSource } from '../../../datasource/shared/datasources/wmts-datasource'; import { WMTSDataSourceOptions } from '../../../datasource/shared/datasources/wmts-datasource.interface'; +import { XYZDataSource } from '../../../datasource/shared/datasources/xyz-datasource'; import { XYZDataSourceOptions } from '../../../datasource/shared/datasources/xyz-datasource.interface'; -import { CartoDataSourceOptions } from '../../../datasource/shared/datasources/carto-datasource.interface'; -import { TileArcGISRestDataSourceOptions } from '../../../datasource/shared/datasources/tilearcgisrest-datasource.interface'; -import { TileDebugDataSourceOptions } from '../../../datasource/shared/datasources/tiledebug-datasource.interface'; +import { LayerOptions } from './layer.interface'; export interface TileLayerOptions extends LayerOptions { source?: diff --git a/packages/geo/src/lib/layer/shared/layers/tile-layer.ts b/packages/geo/src/lib/layer/shared/layers/tile-layer.ts index d47f62c637..580a922fde 100644 --- a/packages/geo/src/lib/layer/shared/layers/tile-layer.ts +++ b/packages/geo/src/lib/layer/shared/layers/tile-layer.ts @@ -1,22 +1,21 @@ +import { AuthInterceptor } from '@igo2/auth'; +import { MessageService } from '@igo2/core'; + +import Tile from 'ol/Tile'; import olLayerTile from 'ol/layer/Tile'; import olSourceTile from 'ol/source/Tile'; -import Tile from 'ol/Tile'; -import { TileWatcher } from '../../utils'; -import { IgoMap } from '../../../map/shared'; - -import { OSMDataSource } from '../../../datasource/shared/datasources/osm-datasource'; -import { WMTSDataSource } from '../../../datasource/shared/datasources/wmts-datasource'; -import { XYZDataSource } from '../../../datasource/shared/datasources/xyz-datasource'; import { CartoDataSource } from '../../../datasource/shared/datasources/carto-datasource'; +import { OSMDataSource } from '../../../datasource/shared/datasources/osm-datasource'; import { TileArcGISRestDataSource } from '../../../datasource/shared/datasources/tilearcgisrest-datasource'; import { TileDebugDataSource } from '../../../datasource/shared/datasources/tiledebug-datasource'; - +import { WMTSDataSource } from '../../../datasource/shared/datasources/wmts-datasource'; +import { XYZDataSource } from '../../../datasource/shared/datasources/xyz-datasource'; +import { IgoMap } from '../../../map/shared'; +import { TileWatcher } from '../../utils'; import { Layer } from './layer'; import { TileLayerOptions } from './tile-layer.interface'; -import { MessageService } from '@igo2/core'; -import { AuthInterceptor } from '@igo2/auth'; export class TileLayer extends Layer { public declare dataSource: | OSMDataSource diff --git a/packages/geo/src/lib/layer/shared/layers/vector-layer.interface.ts b/packages/geo/src/lib/layer/shared/layers/vector-layer.interface.ts index fe4856a0dc..3df344137c 100644 --- a/packages/geo/src/lib/layer/shared/layers/vector-layer.interface.ts +++ b/packages/geo/src/lib/layer/shared/layers/vector-layer.interface.ts @@ -1,28 +1,24 @@ -import olStyle from 'ol/style/Style'; +import Feature from 'ol/Feature'; +import * as olColor from 'ol/color'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; import olLayerVector from 'ol/layer/Vector'; +import RenderFeature from 'ol/render/Feature'; import olSourceVector from 'ol/source/Vector'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; -import * as olColor from 'ol/color'; - -import { LayerOptions } from './layer.interface'; +import olStyle from 'ol/style/Style'; -import { FeatureDataSource } from '../../../datasource/shared/datasources/feature-datasource'; -import { WFSDataSource } from '../../../datasource/shared/datasources/wfs-datasource'; import { ArcGISRestDataSource } from '../../../datasource/shared/datasources/arcgisrest-datasource'; -import { WebSocketDataSource } from '../../../datasource/shared/datasources/websocket-datasource'; +import { ArcGISRestDataSourceOptions } from '../../../datasource/shared/datasources/arcgisrest-datasource.interface'; import { ClusterDataSource } from '../../../datasource/shared/datasources/cluster-datasource'; - +import { ClusterDataSourceOptions } from '../../../datasource/shared/datasources/cluster-datasource.interface'; +import { FeatureDataSource } from '../../../datasource/shared/datasources/feature-datasource'; import { FeatureDataSourceOptions } from '../../../datasource/shared/datasources/feature-datasource.interface'; -import { WFSDataSourceOptions } from '../../../datasource/shared/datasources/wfs-datasource.interface'; -import { ArcGISRestDataSourceOptions } from '../../../datasource/shared/datasources/arcgisrest-datasource.interface'; +import { WebSocketDataSource } from '../../../datasource/shared/datasources/websocket-datasource'; import { WebSocketDataSourceOptions } from '../../../datasource/shared/datasources/websocket-datasource.interface'; -import { ClusterDataSourceOptions } from '../../../datasource/shared/datasources/cluster-datasource.interface'; - -import { ClusterParam } from '../clusterParam'; - +import { WFSDataSource } from '../../../datasource/shared/datasources/wfs-datasource'; +import { WFSDataSourceOptions } from '../../../datasource/shared/datasources/wfs-datasource.interface'; import { IgoStyle } from '../../../style/shared/vector/vector-style.interface'; -import RenderFeature from 'ol/render/Feature'; -import Feature from 'ol/Feature'; +import { ClusterParam } from '../clusterParam'; +import { LayerOptions } from './layer.interface'; export interface VectorLayerOptions extends LayerOptions { source?: diff --git a/packages/geo/src/lib/layer/shared/layers/vector-layer.ts b/packages/geo/src/lib/layer/shared/layers/vector-layer.ts index 089daf7197..10c4884b1a 100644 --- a/packages/geo/src/lib/layer/shared/layers/vector-layer.ts +++ b/packages/geo/src/lib/layer/shared/layers/vector-layer.ts @@ -1,28 +1,38 @@ -import olLayerVector from 'ol/layer/Vector'; -import olSourceVector from 'ol/source/Vector'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; +import { AuthInterceptor } from '@igo2/auth'; +import { MessageService } from '@igo2/core'; +import { ObjectUtils } from '@igo2/utils'; + +import olFeature from 'ol/Feature'; +import OlFeature from 'ol/Feature'; import { unByKey } from 'ol/Observable'; -import { easeOut } from 'ol/easing'; import { asArray as ColorAsArray } from 'ol/color'; -import { getVectorContext } from 'ol/render'; -import olFeature from 'ol/Feature'; -import olProjection from 'ol/proj/Projection'; -import * as olproj from 'ol/proj'; +import { easeOut } from 'ol/easing'; +import BaseEvent from 'ol/events/Event'; +import { Extent } from 'ol/extent'; +import { FeatureLoader } from 'ol/featureloader'; import * as olformat from 'ol/format'; -import OlFeature from 'ol/Feature'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olLayerVector from 'ol/layer/Vector'; +import * as olproj from 'ol/proj'; +import olProjection from 'ol/proj/Projection'; +import { getVectorContext } from 'ol/render'; +import olSourceVector from 'ol/source/Vector'; + +import { fromEvent, of, zip } from 'rxjs'; +import { + catchError, + concatMap, + debounceTime, + delay, + first +} from 'rxjs/operators'; -import { FeatureDataSource } from '../../../datasource/shared/datasources/feature-datasource'; -import { WFSDataSource } from '../../../datasource/shared/datasources/wfs-datasource'; import { ArcGISRestDataSource } from '../../../datasource/shared/datasources/arcgisrest-datasource'; -import { WebSocketDataSource } from '../../../datasource/shared/datasources/websocket-datasource'; import { ClusterDataSource } from '../../../datasource/shared/datasources/cluster-datasource'; - -import { VectorWatcher } from '../../utils'; -import { IgoMap, MapExtent, getResolutionFromScale } from '../../../map/shared'; -import { Layer } from './layer'; -import { VectorLayerOptions } from './vector-layer.interface'; -import { AuthInterceptor } from '@igo2/auth'; -import { MessageService } from '@igo2/core'; +import { FeatureDataSource } from '../../../datasource/shared/datasources/feature-datasource'; +import { FeatureDataSourceOptions } from '../../../datasource/shared/datasources/feature-datasource.interface'; +import { WebSocketDataSource } from '../../../datasource/shared/datasources/websocket-datasource'; +import { WFSDataSource } from '../../../datasource/shared/datasources/wfs-datasource'; import { WFSDataSourceOptions } from '../../../datasource/shared/datasources/wfs-datasource.interface'; import { buildUrl, @@ -32,28 +42,19 @@ import { OgcFilterableDataSourceOptions, OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface'; +import { IgoMap, MapExtent, getResolutionFromScale } from '../../../map/shared'; +import { LayerDBData } from '../../../offline'; +import { InsertSourceInsertDBEnum } from '../../../offline/geoDB/geoDB.enums'; +import { GeoDBService } from '../../../offline/geoDB/geoDB.service'; +import { LayerDBService } from '../../../offline/layerDB/layerDB.service'; import { GeoNetworkService, SimpleGetOptions } from '../../../offline/shared/geo-network.service'; -import { - catchError, - concatMap, - debounceTime, - delay, - first -} from 'rxjs/operators'; -import { GeoDBService } from '../../../offline/geoDB/geoDB.service'; -import { fromEvent, of, zip } from 'rxjs'; -import { InsertSourceInsertDBEnum } from '../../../offline/geoDB/geoDB.enums'; -import { LayerDBService } from '../../../offline/layerDB/layerDB.service'; -import { LayerDBData } from '../../../offline'; -import BaseEvent from 'ol/events/Event'; import { olStyleToBasicIgoStyle } from '../../../style/shared/vector/conversion.utils'; -import { FeatureDataSourceOptions } from '../../../datasource/shared/datasources/feature-datasource.interface'; -import { ObjectUtils } from '@igo2/utils'; -import { Extent } from 'ol/extent'; -import { FeatureLoader } from 'ol/featureloader'; +import { VectorWatcher } from '../../utils'; +import { Layer } from './layer'; +import { VectorLayerOptions } from './vector-layer.interface'; export class VectorLayer extends Layer { private previousLoadExtent: Extent; diff --git a/packages/geo/src/lib/layer/shared/layers/vectortile-layer.interface.ts b/packages/geo/src/lib/layer/shared/layers/vectortile-layer.interface.ts index a9a7ac680b..c2a8af196d 100644 --- a/packages/geo/src/lib/layer/shared/layers/vectortile-layer.interface.ts +++ b/packages/geo/src/lib/layer/shared/layers/vectortile-layer.interface.ts @@ -1,15 +1,12 @@ -import olStyle from 'ol/style/Style'; +import Feature from 'ol/Feature'; import olLayerVectorTile from 'ol/layer/VectorTile'; - -import { LayerOptions } from './layer.interface'; +import RenderFeature from 'ol/render/Feature'; +import olStyle from 'ol/style/Style'; import { MVTDataSource } from '../../../datasource/shared/datasources/mvt-datasource'; - import { MVTDataSourceOptions } from '../../../datasource/shared/datasources/mvt-datasource.interface'; - import { IgoStyle } from '../../../style/shared/vector/vector-style.interface'; -import RenderFeature from 'ol/render/Feature'; -import Feature from 'ol/Feature'; +import { LayerOptions } from './layer.interface'; export interface VectorTileLayerOptions extends LayerOptions { style?: diff --git a/packages/geo/src/lib/layer/shared/layers/vectortile-layer.ts b/packages/geo/src/lib/layer/shared/layers/vectortile-layer.ts index a175ccbdc5..51c9f8e66e 100644 --- a/packages/geo/src/lib/layer/shared/layers/vectortile-layer.ts +++ b/packages/geo/src/lib/layer/shared/layers/vectortile-layer.ts @@ -1,15 +1,15 @@ +import { AuthInterceptor } from '@igo2/auth'; +import { MessageService } from '@igo2/core'; + +import VectorTile from 'ol/VectorTile'; import olLayerVectorTile from 'ol/layer/VectorTile'; import olSourceVectorTile from 'ol/source/VectorTile'; import { MVTDataSource } from '../../../datasource/shared/datasources/mvt-datasource'; - +import { IgoMap } from '../../../map/shared'; +import { TileWatcher } from '../../utils'; import { Layer } from './layer'; import { VectorTileLayerOptions } from './vectortile-layer.interface'; -import { TileWatcher } from '../../utils'; -import { AuthInterceptor } from '@igo2/auth'; -import { IgoMap } from '../../../map/shared'; -import { MessageService } from '@igo2/core'; -import VectorTile from 'ol/VectorTile'; export class VectorTileLayer extends Layer { public declare dataSource: MVTDataSource; diff --git a/packages/geo/src/lib/layer/track-feature-button/track-feature-button.component.ts b/packages/geo/src/lib/layer/track-feature-button/track-feature-button.component.ts index 85fb57ff01..dc74136474 100644 --- a/packages/geo/src/lib/layer/track-feature-button/track-feature-button.component.ts +++ b/packages/geo/src/lib/layer/track-feature-button/track-feature-button.component.ts @@ -1,7 +1,7 @@ import { + ChangeDetectionStrategy, Component, Input, - ChangeDetectionStrategy, OnInit } from '@angular/core'; diff --git a/packages/geo/src/lib/layer/utils/image-watcher.ts b/packages/geo/src/lib/layer/utils/image-watcher.ts index c6c14c7947..7af469ee73 100644 --- a/packages/geo/src/lib/layer/utils/image-watcher.ts +++ b/packages/geo/src/lib/layer/utils/image-watcher.ts @@ -1,6 +1,8 @@ -import olSourceImage from 'ol/source/Image'; -import { uuid, Watcher, SubjectStatus } from '@igo2/utils'; import { MessageService } from '@igo2/core'; +import { SubjectStatus, Watcher, uuid } from '@igo2/utils'; + +import olSourceImage from 'ol/source/Image'; + import { ImageLayer } from '../shared/layers/image-layer'; export class ImageWatcher extends Watcher { diff --git a/packages/geo/src/lib/layer/utils/tile-watcher.ts b/packages/geo/src/lib/layer/utils/tile-watcher.ts index daa97eb2c7..61516124a8 100644 --- a/packages/geo/src/lib/layer/utils/tile-watcher.ts +++ b/packages/geo/src/lib/layer/utils/tile-watcher.ts @@ -1,5 +1,6 @@ +import { SubjectStatus, Watcher, uuid } from '@igo2/utils'; + import olSourceTile from 'ol/source/Tile'; -import { uuid, Watcher, SubjectStatus } from '@igo2/utils'; import { TileLayer } from '../shared/layers/tile-layer'; import { VectorTileLayer } from '../shared/layers/vectortile-layer'; diff --git a/packages/geo/src/lib/layer/utils/vector-watcher.ts b/packages/geo/src/lib/layer/utils/vector-watcher.ts index e48fb5ce03..543c1221be 100644 --- a/packages/geo/src/lib/layer/utils/vector-watcher.ts +++ b/packages/geo/src/lib/layer/utils/vector-watcher.ts @@ -1,7 +1,7 @@ -import { uuid, Watcher, SubjectStatus } from '@igo2/utils'; +import { SubjectStatus, Watcher, uuid } from '@igo2/utils'; -import { VectorLayer } from '../shared/layers/vector-layer'; import { ClusterDataSource } from '../../datasource/shared/datasources/cluster-datasource'; +import { VectorLayer } from '../shared/layers/vector-layer'; export class VectorWatcher extends Watcher { private id: string; diff --git a/packages/geo/src/lib/map/baselayers-switcher/baselayers-switcher.animation.ts b/packages/geo/src/lib/map/baselayers-switcher/baselayers-switcher.animation.ts index 8b8a57c394..75ead01f67 100644 --- a/packages/geo/src/lib/map/baselayers-switcher/baselayers-switcher.animation.ts +++ b/packages/geo/src/lib/map/baselayers-switcher/baselayers-switcher.animation.ts @@ -1,10 +1,10 @@ import { - trigger, + AnimationTriggerMetadata, + animate, state, style, transition, - animate, - AnimationTriggerMetadata + trigger } from '@angular/animations'; export function baseLayersSwitcherSlideInOut(): AnimationTriggerMetadata { diff --git a/packages/geo/src/lib/map/baselayers-switcher/baselayers-switcher.component.ts b/packages/geo/src/lib/map/baselayers-switcher/baselayers-switcher.component.ts index 6085880be8..02af1d46d7 100644 --- a/packages/geo/src/lib/map/baselayers-switcher/baselayers-switcher.component.ts +++ b/packages/geo/src/lib/map/baselayers-switcher/baselayers-switcher.component.ts @@ -1,7 +1,9 @@ -import { Component, Input, AfterViewInit, OnDestroy } from '@angular/core'; +import { AfterViewInit, Component, Input, OnDestroy } from '@angular/core'; + +import { Media, MediaService } from '@igo2/core'; + import { Subscription } from 'rxjs'; -import { MediaService, Media } from '@igo2/core'; import { Layer } from '../../layer/shared'; import { IgoMap } from '../shared'; import { baseLayersSwitcherSlideInOut } from './baselayers-switcher.animation'; diff --git a/packages/geo/src/lib/map/baselayers-switcher/mini-basemap.component.ts b/packages/geo/src/lib/map/baselayers-switcher/mini-basemap.component.ts index a97c854054..659ef5a66d 100644 --- a/packages/geo/src/lib/map/baselayers-switcher/mini-basemap.component.ts +++ b/packages/geo/src/lib/map/baselayers-switcher/mini-basemap.component.ts @@ -1,19 +1,19 @@ import { - Component, - Input, AfterViewInit, - OnDestroy, ApplicationRef, - ChangeDetectorRef + ChangeDetectorRef, + Component, + Input, + OnDestroy } from '@angular/core'; +import OlMap from 'ol/Map'; +import OlView from 'ol/View'; + import { Layer, LayerOptions } from '../../layer/shared'; import { LayerService } from '../../layer/shared/layer.service'; import { IgoMap } from '../shared'; -import OlMap from 'ol/Map'; -import OlView from 'ol/View'; - @Component({ selector: 'igo-mini-basemap', templateUrl: './mini-basemap.component.html', diff --git a/packages/geo/src/lib/map/geolocate-button/geolocate-button.component.ts b/packages/geo/src/lib/map/geolocate-button/geolocate-button.component.ts index f999bc87d7..95c008b814 100644 --- a/packages/geo/src/lib/map/geolocate-button/geolocate-button.component.ts +++ b/packages/geo/src/lib/map/geolocate-button/geolocate-button.component.ts @@ -1,8 +1,9 @@ import { AfterContentInit, Component, Input, OnDestroy } from '@angular/core'; -import { BehaviorSubject, Subscription } from 'rxjs'; import { ConfigService } from '@igo2/core'; +import { BehaviorSubject, Subscription } from 'rxjs'; + import { IgoMap } from '../shared/map'; @Component({ diff --git a/packages/geo/src/lib/map/home-extent-button/home-extent-button.component.ts b/packages/geo/src/lib/map/home-extent-button/home-extent-button.component.ts index d17fa22b1f..71fc76f087 100644 --- a/packages/geo/src/lib/map/home-extent-button/home-extent-button.component.ts +++ b/packages/geo/src/lib/map/home-extent-button/home-extent-button.component.ts @@ -1,8 +1,12 @@ -import { ConfigService } from '@igo2/core'; import { Component, Input } from '@angular/core'; + +import { ConfigService } from '@igo2/core'; + +import * as olproj from 'ol/proj'; + import { IgoMap } from '../shared/map'; import { MapExtent } from '../shared/map.interface'; -import * as olproj from 'ol/proj'; + /* Button to center the map to the home extent */ diff --git a/packages/geo/src/lib/map/map-browser/map-browser.component.ts b/packages/geo/src/lib/map/map-browser/map-browser.component.ts index 0db69e61c1..eeda8b1a34 100644 --- a/packages/geo/src/lib/map/map-browser/map-browser.component.ts +++ b/packages/geo/src/lib/map/map-browser/map-browser.component.ts @@ -1,14 +1,15 @@ import { + AfterViewInit, Component, Input, - OnInit, - AfterViewInit, - OnDestroy + OnDestroy, + OnInit } from '@angular/core'; -import { Subscription } from 'rxjs'; -import { SubjectStatus } from '@igo2/utils'; import { ActivityService } from '@igo2/core'; +import { SubjectStatus } from '@igo2/utils'; + +import { Subscription } from 'rxjs'; import { IgoMap } from '../shared/map'; import { MapControlsOptions, MapViewOptions } from '../shared/map.interface'; diff --git a/packages/geo/src/lib/map/map-center/map-center.component.ts b/packages/geo/src/lib/map/map-center/map-center.component.ts index 5ba743012c..3c3e9a3656 100644 --- a/packages/geo/src/lib/map/map-center/map-center.component.ts +++ b/packages/geo/src/lib/map/map-center/map-center.component.ts @@ -1,7 +1,9 @@ import { AfterViewInit, Component, Input, OnDestroy } from '@angular/core'; -import { IgoMap } from '../shared/map'; + import { Subscription } from 'rxjs'; +import { IgoMap } from '../shared/map'; + /** * Tool to display the center of the map */ diff --git a/packages/geo/src/lib/map/map.module.ts b/packages/geo/src/lib/map/map.module.ts index a4eb140de8..9a88ad4d25 100644 --- a/packages/geo/src/lib/map/map.module.ts +++ b/packages/geo/src/lib/map/map.module.ts @@ -1,26 +1,28 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { IgoLanguageModule } from '@igo2/core'; + import { IgoConfirmDialogModule } from '@igo2/common'; -import { MapBrowserComponent } from './map-browser/map-browser.component'; -import { ZoomButtonComponent } from './zoom-button/zoom-button.component'; -import { GeolocateButtonComponent } from './geolocate-button/geolocate-button.component'; -import { HomeExtentButtonComponent } from './home-extent-button/home-extent-button.component'; -import { RotationButtonComponent } from './rotation-button/rotation-button.component'; +import { IgoLanguageModule } from '@igo2/core'; + import { BaseLayersSwitcherComponent } from './baselayers-switcher/baselayers-switcher.component'; import { MiniBaseMapComponent } from './baselayers-switcher/mini-basemap.component'; -import { MapOfflineDirective } from './shared/mapOffline.directive'; +import { GeolocateButtonComponent } from './geolocate-button/geolocate-button.component'; +import { HomeExtentButtonComponent } from './home-extent-button/home-extent-button.component'; +import { InfoSectionComponent } from './info-section/info-section.component'; +import { MapBrowserComponent } from './map-browser/map-browser.component'; +import { MapCenterComponent } from './map-center/map-center.component'; +import { MenuButtonComponent } from './menu-button/menu-button.component'; import { OfflineButtonComponent } from './offline-button/offline-button.component'; -import { WakeLockButtonComponent } from './wake-lock-button/wake-lock-button.component'; -import { PointerPositionDirective } from './shared/map-pointer-position.directive'; +import { RotationButtonComponent } from './rotation-button/rotation-button.component'; import { HoverFeatureDirective } from './shared/hover-feature.directive'; +import { PointerPositionDirective } from './shared/map-pointer-position.directive'; +import { MapOfflineDirective } from './shared/mapOffline.directive'; import { SwipeControlComponent } from './swipe-control/swipe-control.component'; -import { MapCenterComponent } from './map-center/map-center.component'; -import { MenuButtonComponent } from './menu-button/menu-button.component'; -import { InfoSectionComponent } from './info-section/info-section.component'; +import { WakeLockButtonComponent } from './wake-lock-button/wake-lock-button.component'; +import { ZoomButtonComponent } from './zoom-button/zoom-button.component'; @NgModule({ imports: [ diff --git a/packages/geo/src/lib/map/offline-button/offline-button.component.ts b/packages/geo/src/lib/map/offline-button/offline-button.component.ts index 28799b226b..6d928103bb 100644 --- a/packages/geo/src/lib/map/offline-button/offline-button.component.ts +++ b/packages/geo/src/lib/map/offline-button/offline-button.component.ts @@ -1,4 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; + import { IgoMap } from '../shared/map'; @Component({ diff --git a/packages/geo/src/lib/map/rotation-button/rotation-button.component.ts b/packages/geo/src/lib/map/rotation-button/rotation-button.component.ts index 7e88e7a97e..afd150c378 100644 --- a/packages/geo/src/lib/map/rotation-button/rotation-button.component.ts +++ b/packages/geo/src/lib/map/rotation-button/rotation-button.component.ts @@ -1,6 +1,7 @@ import { AfterContentInit, Component, Input } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; + import { bearingToAzimuth } from '@turf/helpers'; +import { BehaviorSubject } from 'rxjs'; import { IgoMap } from '../shared/map'; diff --git a/packages/geo/src/lib/map/shared/controllers/controller.ts b/packages/geo/src/lib/map/shared/controllers/controller.ts index c3415324c7..928f3b1d05 100644 --- a/packages/geo/src/lib/map/shared/controllers/controller.ts +++ b/packages/geo/src/lib/map/shared/controllers/controller.ts @@ -1,6 +1,6 @@ -import { EventsKey } from 'ol/events'; import OlMap from 'ol/Map'; import { unByKey } from 'ol/Observable'; +import { EventsKey } from 'ol/events'; /** * Base map controller diff --git a/packages/geo/src/lib/map/shared/controllers/geolocation.ts b/packages/geo/src/lib/map/shared/controllers/geolocation.ts index 5f196d95b2..80f42ca67e 100644 --- a/packages/geo/src/lib/map/shared/controllers/geolocation.ts +++ b/packages/geo/src/lib/map/shared/controllers/geolocation.ts @@ -1,27 +1,30 @@ -import { BehaviorSubject, interval, Subscription } from 'rxjs'; -import { switchMap } from 'rxjs/operators'; -import OlMap from 'ol/Map'; -import olGeolocation from 'ol/Geolocation'; -import Geometry from 'ol/geom/Geometry'; -import * as olproj from 'ol/proj'; +import { ConfigService, StorageService } from '@igo2/core'; + import olFeature from 'ol/Feature'; -import { MapController } from './controller'; +import olGeolocation from 'ol/Geolocation'; +import OlMap from 'ol/Map'; import { Point, Polygon } from 'ol/geom'; +import OlCircle from 'ol/geom/Circle'; +import Geometry from 'ol/geom/Geometry'; import { fromCircle } from 'ol/geom/Polygon'; +import * as olproj from 'ol/proj'; import * as olSphere from 'ol/sphere'; -import OlCircle from 'ol/geom/Circle'; import * as olstyle from 'ol/style'; -import { StorageService, ConfigService } from '@igo2/core'; -import { Overlay } from '../../../overlay/shared/overlay'; + +import { BehaviorSubject, Subscription, interval } from 'rxjs'; +import { switchMap } from 'rxjs/operators'; + import { FeatureMotion } from '../../../feature/shared/feature.enums'; -import { MapViewOptions } from '../map.interface'; -import { MapBase } from '../map.abstract'; import { computeOlFeaturesExtent, featuresAreOutOfView, hideOlFeature, moveToOlFeatures } from '../../../feature/shared/feature.utils'; +import { Overlay } from '../../../overlay/shared/overlay'; +import { MapBase } from '../map.abstract'; +import { MapViewOptions } from '../map.interface'; +import { MapController } from './controller'; import { GeolocationBuffer, GeolocationOverlayType, diff --git a/packages/geo/src/lib/map/shared/controllers/view.ts b/packages/geo/src/lib/map/shared/controllers/view.ts index e3a2bf433b..2967c95684 100644 --- a/packages/geo/src/lib/map/shared/controllers/view.ts +++ b/packages/geo/src/lib/map/shared/controllers/view.ts @@ -1,20 +1,19 @@ import OlMap from 'ol/Map'; import OlMapEvent from 'ol/MapEvent'; - -import { BehaviorSubject, Subject, Subscription } from 'rxjs'; -import { debounceTime } from 'rxjs/operators'; - +import { ObjectEvent } from 'ol/Object'; +import OlView from 'ol/View'; import * as oleasing from 'ol/easing'; +import { EventsKey } from 'ol/events'; import * as olproj from 'ol/proj'; import OlProjection from 'ol/proj/Projection'; -import OlView from 'ol/View'; + +import { BehaviorSubject, Subject, Subscription } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; import { MapViewAction } from '../map.enums'; import { MapExtent, MapViewState } from '../map.interface'; import { getScaleFromResolution, viewStatesAreEqual } from '../map.utils'; import { MapController } from './controller'; -import { EventsKey } from 'ol/events'; -import { ObjectEvent } from 'ol/Object'; export interface MapViewControllerOptions { stateHistory: boolean; diff --git a/packages/geo/src/lib/map/shared/hover-feature.directive.ts b/packages/geo/src/lib/map/shared/hover-feature.directive.ts index 93943d1d88..34e928d5a5 100644 --- a/packages/geo/src/lib/map/shared/hover-feature.directive.ts +++ b/packages/geo/src/lib/map/shared/hover-feature.directive.ts @@ -1,41 +1,40 @@ import { Directive, + HostListener, Input, OnDestroy, - Self, OnInit, - HostListener + Self } from '@angular/core'; -import olLayerVectorTile from 'ol/layer/VectorTile'; -import olLayerVector from 'ol/layer/Vector'; - -import { Subscription } from 'rxjs'; -import olVectorTileSource from 'ol/source/VectorTile'; -import type { default as OlMapBrowserEvent } from 'ol/MapBrowserEvent'; - -import { IgoMap } from '../../map/shared/map'; -import { MapBrowserComponent } from '../../map/map-browser/map-browser.component'; -import { Feature } from '../../feature/shared/feature.interfaces'; +import { EntityStore } from '@igo2/common'; +import { MediaService } from '@igo2/core'; +import { SubjectStatus } from '@igo2/utils'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; import OlFeature from 'ol/Feature'; +import type { default as OlMapBrowserEvent } from 'ol/MapBrowserEvent'; +import { unByKey } from 'ol/Observable'; import * as OlGeom from 'ol/geom'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olLayerVector from 'ol/layer/Vector'; +import olLayerVectorTile from 'ol/layer/VectorTile'; +import RenderFeature from 'ol/render/Feature'; +import olVectorTileSource from 'ol/source/VectorTile'; -import { EntityStore } from '@igo2/common'; -import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource'; -import { VectorLayer, Layer, VectorTileLayer } from '../../layer/shared/layers'; +import { Subscription } from 'rxjs'; import { first } from 'rxjs/operators'; + +import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource'; import { tryBindStoreLayer } from '../../feature/shared/feature-store.utils'; -import { FeatureStore } from '../../feature/shared/store'; import { FeatureMotion } from '../../feature/shared/feature.enums'; -import { MediaService } from '@igo2/core'; -import { StyleService } from '../../style/style-service/style.service'; -import { unByKey } from 'ol/Observable'; -import RenderFeature from 'ol/render/Feature'; -import { StyleByAttribute } from '../../style/shared/vector/vector-style.interface'; +import { Feature } from '../../feature/shared/feature.interfaces'; +import { FeatureStore } from '../../feature/shared/store'; +import { Layer, VectorLayer, VectorTileLayer } from '../../layer/shared/layers'; +import { MapBrowserComponent } from '../../map/map-browser/map-browser.component'; +import { IgoMap } from '../../map/shared/map'; import { hoverFeatureMarkerStyle } from '../../style/shared/feature/feature-style'; -import { SubjectStatus } from '@igo2/utils'; +import { StyleByAttribute } from '../../style/shared/vector/vector-style.interface'; +import { StyleService } from '../../style/style-service/style.service'; /** * This directive makes the mouse coordinate trigger a reverse search on available search sources. diff --git a/packages/geo/src/lib/map/shared/linkedLayers.utils.ts b/packages/geo/src/lib/map/shared/linkedLayers.utils.ts index 48a9f56940..c18a977572 100644 --- a/packages/geo/src/lib/map/shared/linkedLayers.utils.ts +++ b/packages/geo/src/lib/map/shared/linkedLayers.utils.ts @@ -1,17 +1,18 @@ import { ObjectEvent } from 'ol/Object'; +import olSourceImageWMS from 'ol/source/ImageWMS'; import { getUid } from 'ol/util'; + +import { + TimeFilterableDataSource, + TimeFilterableDataSourceOptions +} from '../../datasource'; import { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource'; +import { OgcFilterWriter } from '../../filter/shared/ogc-filter'; import { OgcFilterableDataSource, OgcFilterableDataSourceOptions } from '../../filter/shared/ogc-filter.interface'; import { Layer, LinkedProperties } from '../../layer/shared/layers'; -import olSourceImageWMS from 'ol/source/ImageWMS'; -import { OgcFilterWriter } from '../../filter/shared/ogc-filter'; -import { - TimeFilterableDataSource, - TimeFilterableDataSourceOptions -} from '../../datasource'; import { MapBase } from '../shared/map.abstract'; export function getLinkedLayersOptions(layer: Layer) { diff --git a/packages/geo/src/lib/map/shared/map-pointer-position.directive.ts b/packages/geo/src/lib/map/shared/map-pointer-position.directive.ts index c8da456e3e..d3e2f78e67 100644 --- a/packages/geo/src/lib/map/shared/map-pointer-position.directive.ts +++ b/packages/geo/src/lib/map/shared/map-pointer-position.directive.ts @@ -1,21 +1,22 @@ import { Directive, - Input, - Output, EventEmitter, + Input, OnDestroy, - Self, - OnInit + OnInit, + Output, + Self } from '@angular/core'; +import { MediaService } from '@igo2/core'; + import MapBrowserPointerEvent from 'ol/MapBrowserEvent'; +import { unByKey } from 'ol/Observable'; +import { transform } from 'ol/proj'; -import { IgoMap } from '../../map/shared/map'; import { MapBrowserComponent } from '../../map/map-browser/map-browser.component'; +import { IgoMap } from '../../map/shared/map'; -import { transform } from 'ol/proj'; -import { MediaService } from '@igo2/core'; -import { unByKey } from 'ol/Observable'; /** * This directive return the pointer coordinate (on click or pointermove) * in [longitude, latitude], delayed by in input (pointerMoveDelay) diff --git a/packages/geo/src/lib/map/shared/map.abstract.ts b/packages/geo/src/lib/map/shared/map.abstract.ts index 2e57c98d28..cda66d183e 100644 --- a/packages/geo/src/lib/map/shared/map.abstract.ts +++ b/packages/geo/src/lib/map/shared/map.abstract.ts @@ -1,11 +1,16 @@ -import { Layer } from '../../layer'; +import { SubjectStatus } from '@igo2/utils'; + +import { ObjectEvent } from 'ol/Object'; +import { Layer as OlLayer } from 'ol/layer'; import { Projection } from 'ol/proj'; import { Source } from 'ol/source'; -import { Layer as OlLayer } from 'ol/layer'; + import { Map } from 'ol'; import { BehaviorSubject, Subject } from 'rxjs'; -import { ObjectEvent } from 'ol/Object'; -import { SubjectStatus } from '@igo2/utils'; + +import { FeatureDataSource } from '../../datasource'; +import { Layer } from '../../layer'; +import { Overlay } from '../../overlay'; import { MapControlsOptions, MapExtent, @@ -13,8 +18,6 @@ import { MapViewController, MapViewOptions } from '../shared'; -import { FeatureDataSource } from '../../datasource'; -import { Overlay } from '../../overlay'; export abstract class MapBase { ol: Map; diff --git a/packages/geo/src/lib/map/shared/map.ts b/packages/geo/src/lib/map/shared/map.ts index ae7013ee50..ce6dfc0981 100644 --- a/packages/geo/src/lib/map/shared/map.ts +++ b/packages/geo/src/lib/map/shared/map.ts @@ -1,44 +1,43 @@ +import { ConfigService, StorageService } from '@igo2/core'; +import { SubjectStatus } from '@igo2/utils'; + import olMap from 'ol/Map'; +import { ObjectEvent } from 'ol/Object'; import olView, { ViewOptions } from 'ol/View'; import olControlAttribution from 'ol/control/Attribution'; import olControlScaleLine from 'ol/control/ScaleLine'; -import * as olproj from 'ol/proj'; -import * as olproj4 from 'ol/proj/proj4'; -import OlProjection from 'ol/proj/Projection'; import * as olinteraction from 'ol/interaction'; -import { getUid } from 'ol/util'; import olLayer from 'ol/layer/Layer'; +import * as olproj from 'ol/proj'; +import OlProjection from 'ol/proj/Projection'; +import * as olproj4 from 'ol/proj/proj4'; import olSource from 'ol/source/Source'; +import { getUid } from 'ol/util'; import proj4 from 'proj4'; -import { BehaviorSubject, pairwise, skipWhile, Subject } from 'rxjs'; - -import { SubjectStatus } from '@igo2/utils'; +import { BehaviorSubject, Subject, pairwise, skipWhile } from 'rxjs'; +import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource'; import { Layer, VectorLayer } from '../../layer/shared/layers'; import { Overlay } from '../../overlay/shared/overlay'; - import { LayerWatcher } from '../utils/layer-watcher'; -import { - MapViewOptions, - MapOptions, - MapAttributionOptions, - MapScaleLineOptions, - MapExtent, - MapControlsOptions -} from './map.interface'; -import { MapBase } from './map.abstract'; -import { MapViewController } from './controllers/view'; -import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource'; import { MapGeolocationController } from './controllers/geolocation'; -import { StorageService, ConfigService } from '@igo2/core'; -import { ObjectEvent } from 'ol/Object'; +import { MapViewController } from './controllers/view'; import { getAllChildLayersByDeletion, getRootParentByDeletion, handleLayerPropertyChange, initLayerSyncFromRootParentLayers } from './linkedLayers.utils'; +import { MapBase } from './map.abstract'; +import { + MapAttributionOptions, + MapControlsOptions, + MapExtent, + MapOptions, + MapScaleLineOptions, + MapViewOptions +} from './map.interface'; // TODO: This class is messy. Clearly define it's scope and the map browser's. // Move some stuff into controllers. diff --git a/packages/geo/src/lib/map/shared/map.utils.ts b/packages/geo/src/lib/map/shared/map.utils.ts index 454861bfae..95362bb16e 100644 --- a/packages/geo/src/lib/map/shared/map.utils.ts +++ b/packages/geo/src/lib/map/shared/map.utils.ts @@ -1,8 +1,8 @@ -import * as olproj from 'ol/proj'; +import { NumberUtils } from '@igo2/utils'; + import MapBrowserPointerEvent from 'ol/MapBrowserEvent'; import { MAC } from 'ol/has'; - -import { NumberUtils } from '@igo2/utils'; +import * as olproj from 'ol/proj'; import { MapViewState } from './map.interface'; import { Projection } from './projection.interfaces'; diff --git a/packages/geo/src/lib/map/shared/mapOffline.directive.ts b/packages/geo/src/lib/map/shared/mapOffline.directive.ts index bec773d47c..e1f4605fcf 100644 --- a/packages/geo/src/lib/map/shared/mapOffline.directive.ts +++ b/packages/geo/src/lib/map/shared/mapOffline.directive.ts @@ -1,12 +1,13 @@ -import { Directive, AfterViewInit } from '@angular/core'; -import { NetworkService, ConnectionState, MessageService } from '@igo2/core'; +import { AfterViewInit, Directive } from '@angular/core'; + +import { ConnectionState, MessageService, NetworkService } from '@igo2/core'; -import { IgoMap } from './map'; -import { MapBrowserComponent } from '../map-browser/map-browser.component'; -import { Layer } from '../../layer/shared/layers/layer'; import { combineLatest } from 'rxjs'; import { DataSourceOptions } from '../../datasource/shared/datasources/datasource.interface'; +import { Layer } from '../../layer/shared/layers/layer'; +import { MapBrowserComponent } from '../map-browser/map-browser.component'; +import { IgoMap } from './map'; interface OfflinableSourceOptions extends DataSourceOptions { pathOffline?: string; diff --git a/packages/geo/src/lib/map/shared/projection.service.ts b/packages/geo/src/lib/map/shared/projection.service.ts index 7f71d80612..b7be6e5a84 100644 --- a/packages/geo/src/lib/map/shared/projection.service.ts +++ b/packages/geo/src/lib/map/shared/projection.service.ts @@ -1,10 +1,11 @@ import { Injectable } from '@angular/core'; -import proj4 from 'proj4'; +import { ConfigService } from '@igo2/core'; + import * as olproj from 'ol/proj'; import * as olproj4 from 'ol/proj/proj4'; -import { ConfigService } from '@igo2/core'; +import proj4 from 'proj4'; import { Projection } from './projection.interfaces'; diff --git a/packages/geo/src/lib/map/swipe-control/swipe-control.component.ts b/packages/geo/src/lib/map/swipe-control/swipe-control.component.ts index a894ad01d4..a63916353a 100644 --- a/packages/geo/src/lib/map/swipe-control/swipe-control.component.ts +++ b/packages/geo/src/lib/map/swipe-control/swipe-control.component.ts @@ -1,9 +1,12 @@ -import { Component, Input, AfterViewInit, OnDestroy } from '@angular/core'; -import { Layer } from '../../layer/shared'; -import { IgoMap } from '../shared/map'; +import { AfterViewInit, Component, Input, OnDestroy } from '@angular/core'; + import { getRenderPixel } from 'ol/render'; + import { Subscription } from 'rxjs'; +import { Layer } from '../../layer/shared'; +import { IgoMap } from '../shared/map'; + /** * Tool to swipe the layers */ diff --git a/packages/geo/src/lib/map/utils/layer-watcher.ts b/packages/geo/src/lib/map/utils/layer-watcher.ts index 068ff58b7d..d236c46e64 100644 --- a/packages/geo/src/lib/map/utils/layer-watcher.ts +++ b/packages/geo/src/lib/map/utils/layer-watcher.ts @@ -1,9 +1,11 @@ +import { SubjectStatus, Watcher } from '@igo2/utils'; + +import { ObjectEvent } from 'ol/Object'; + import { BehaviorSubject, Subscription } from 'rxjs'; import { distinctUntilChanged } from 'rxjs/operators'; -import { Watcher, SubjectStatus } from '@igo2/utils'; import { Layer, LinkedProperties } from '../../layer/shared/layers'; -import { ObjectEvent } from 'ol/Object'; export class LayerWatcher extends Watcher { public propertyChange$: BehaviorSubject<{ diff --git a/packages/geo/src/lib/map/wake-lock-button/wake-lock-button.component.ts b/packages/geo/src/lib/map/wake-lock-button/wake-lock-button.component.ts index d9ca443373..936981785c 100644 --- a/packages/geo/src/lib/map/wake-lock-button/wake-lock-button.component.ts +++ b/packages/geo/src/lib/map/wake-lock-button/wake-lock-button.component.ts @@ -1,9 +1,11 @@ import { Component, Input } from '@angular/core'; + import { StorageService } from '@igo2/core'; -import { BehaviorSubject } from 'rxjs'; -import NoSleep from 'nosleep.js'; import { userAgent } from '@igo2/utils'; +import NoSleep from 'nosleep.js'; +import { BehaviorSubject } from 'rxjs'; + @Component({ selector: 'igo-wake-lock-button', templateUrl: './wake-lock-button.component.html', diff --git a/packages/geo/src/lib/measure/measurer/measure-format.pipe.ts b/packages/geo/src/lib/measure/measurer/measure-format.pipe.ts index 90b921a96d..c4979d8539 100644 --- a/packages/geo/src/lib/measure/measurer/measure-format.pipe.ts +++ b/packages/geo/src/lib/measure/measurer/measure-format.pipe.ts @@ -2,9 +2,9 @@ import { Pipe, PipeTransform } from '@angular/core'; import { MeasureAreaUnit, MeasureLengthUnit } from '../shared/measure.enum'; import { + formatMeasure, metersToUnit, - squareMetersToUnit, - formatMeasure + squareMetersToUnit } from '../shared/measure.utils'; /** diff --git a/packages/geo/src/lib/measure/measurer/measurer-dialog.component.ts b/packages/geo/src/lib/measure/measurer/measurer-dialog.component.ts index 4ace8e62d6..31076b713f 100644 --- a/packages/geo/src/lib/measure/measurer/measurer-dialog.component.ts +++ b/packages/geo/src/lib/measure/measurer/measurer-dialog.component.ts @@ -1,9 +1,8 @@ import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; - -import { MeasurerDialogData } from '../shared/measure.interfaces'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MeasureAreaUnit, MeasureLengthUnit } from '../shared/measure.enum'; +import { MeasurerDialogData } from '../shared/measure.interfaces'; @Component({ selector: 'igo-measurer-dialog', diff --git a/packages/geo/src/lib/measure/measurer/measurer-item.component.ts b/packages/geo/src/lib/measure/measurer/measurer-item.component.ts index 88a3c5de0b..3c0527b243 100644 --- a/packages/geo/src/lib/measure/measurer/measurer-item.component.ts +++ b/packages/geo/src/lib/measure/measurer/measurer-item.component.ts @@ -1,18 +1,18 @@ import { + ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, + Input, OnDestroy, - ChangeDetectionStrategy + Output } from '@angular/core'; import { BehaviorSubject, Subscription } from 'rxjs'; import { - MeasureType, MeasureAreaUnit, - MeasureLengthUnit + MeasureLengthUnit, + MeasureType } from '../shared/measure.enum'; import { computeBestAreaUnit, diff --git a/packages/geo/src/lib/measure/measurer/measurer.component.ts b/packages/geo/src/lib/measure/measurer/measurer.component.ts index 4be8ca710b..840e88c89b 100644 --- a/packages/geo/src/lib/measure/measurer/measurer.component.ts +++ b/packages/geo/src/lib/measure/measurer/measurer.component.ts @@ -1,31 +1,31 @@ import { + ChangeDetectionStrategy, Component, Input, - OnInit, OnDestroy, - ChangeDetectionStrategy, + OnInit, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { BehaviorSubject, Subscription } from 'rxjs'; -import { skip } from 'rxjs/operators'; +import { EntityRecord, EntityTableTemplate } from '@igo2/common'; +import type { EntityTableComponent } from '@igo2/common'; +import { LanguageService, StorageScope, StorageService } from '@igo2/core'; +import { uuid } from '@igo2/utils'; -import OlStyle from 'ol/style/Style'; +import OlFeature from 'ol/Feature'; +import { unByKey } from 'ol/Observable'; +import OlOverlay from 'ol/Overlay'; import OlGeoJSON from 'ol/format/GeoJSON'; -import OlVectorSource from 'ol/source/Vector'; -import { VectorSourceEvent as OlVectorSourceEvent } from 'ol/source/Vector'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; import OlLineString from 'ol/geom/LineString'; import OlPolygon from 'ol/geom/Polygon'; -import OlFeature from 'ol/Feature'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; -import OlOverlay from 'ol/Overlay'; -import { unByKey } from 'ol/Observable'; +import OlVectorSource from 'ol/source/Vector'; +import { VectorSourceEvent as OlVectorSourceEvent } from 'ol/source/Vector'; +import OlStyle from 'ol/style/Style'; -import { LanguageService, StorageScope, StorageService } from '@igo2/core'; -import { EntityRecord, EntityTableTemplate } from '@igo2/common'; -import type { EntityTableComponent } from '@igo2/common'; -import { uuid } from '@igo2/utils'; +import { BehaviorSubject, Subscription } from 'rxjs'; +import { skip } from 'rxjs/operators'; import { FeatureDataSource } from '../../datasource'; import { @@ -33,34 +33,33 @@ import { FeatureStore, FeatureStoreLoadingStrategy, FeatureStoreSelectionStrategy, - tryBindStoreLayer, tryAddLoadingStrategy, - tryAddSelectionStrategy + tryAddSelectionStrategy, + tryBindStoreLayer } from '../../feature'; import { DrawControl, ModifyControl } from '../../geometry/shared'; import { VectorLayer } from '../../layer/shared'; import { IgoMap } from '../../map/shared'; - import { - Measure, - MeasurerDialogData, - FeatureWithMeasure -} from '../shared/measure.interfaces'; -import { - MeasureType, MeasureAreaUnit, - MeasureLengthUnit + MeasureLengthUnit, + MeasureType } from '../shared/measure.enum'; import { - measureOlGeometry, + FeatureWithMeasure, + Measure, + MeasurerDialogData +} from '../shared/measure.interfaces'; +import { createMeasureInteractionStyle, createMeasureLayerStyle, - updateOlTooltipsAtMidpoints, - updateOlTooltipAtCenter, + formatMeasure, getTooltipsOfOlGeometry, - squareMetersToUnit, + measureOlGeometry, metersToUnit, - formatMeasure + squareMetersToUnit, + updateOlTooltipAtCenter, + updateOlTooltipsAtMidpoints } from '../shared/measure.utils'; import { MeasurerDialogComponent } from './measurer-dialog.component'; diff --git a/packages/geo/src/lib/measure/measurer/measurer.module.ts b/packages/geo/src/lib/measure/measurer/measurer.module.ts index 3231049926..549bd3a85e 100644 --- a/packages/geo/src/lib/measure/measurer/measurer.module.ts +++ b/packages/geo/src/lib/measure/measurer/measurer.module.ts @@ -1,24 +1,23 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { MatDividerModule } from '@angular/material/divider'; -import { IgoLanguageModule } from '@igo2/core'; import { IgoEntityTableModule } from '@igo2/common'; +import { IgoLanguageModule } from '@igo2/core'; import { MeasureFormatPipe } from './measure-format.pipe'; +import { MeasurerDialogComponent } from './measurer-dialog.component'; import { MeasurerItemComponent } from './measurer-item.component'; import { MeasurerComponent } from './measurer.component'; -import { MeasurerDialogComponent } from './measurer-dialog.component'; -import { MatDialogModule } from '@angular/material/dialog'; /** * @ignore diff --git a/packages/geo/src/lib/measure/shared/measure.utils.ts b/packages/geo/src/lib/measure/shared/measure.utils.ts index 017b0b57e3..7dc161883f 100644 --- a/packages/geo/src/lib/measure/shared/measure.utils.ts +++ b/packages/geo/src/lib/measure/shared/measure.utils.ts @@ -1,20 +1,21 @@ import { LanguageService } from '@igo2/core'; -import * as olstyle from 'ol/style'; -import OlPoint from 'ol/geom/Point'; -import OlLineString from 'ol/geom/LineString'; -import OlPolygon from 'ol/geom/Polygon'; -import OlCircle from 'ol/geom/Circle'; + import OlOverlay from 'ol/Overlay'; import { getCenter as olGetCenter } from 'ol/extent'; -import { getLength as olGetLength, getArea as olGetArea } from 'ol/sphere'; +import OlCircle from 'ol/geom/Circle'; +import OlLineString from 'ol/geom/LineString'; +import OlPoint from 'ol/geom/Point'; +import OlPolygon from 'ol/geom/Polygon'; +import { getArea as olGetArea, getLength as olGetLength } from 'ol/sphere'; +import * as olstyle from 'ol/style'; -import { Measure } from './measure.interfaces'; import { MeasureAreaUnit, MeasureAreaUnitAbbreviation, MeasureLengthUnit, MeasureLengthUnitAbbreviation } from './measure.enum'; +import { Measure } from './measure.interfaces'; /** * Convert value from meters to kilometers diff --git a/packages/geo/src/lib/metadata/metadata-button/metadata-button.component.ts b/packages/geo/src/lib/metadata/metadata-button/metadata-button.component.ts index 98e6aa1efc..0933d8e2dc 100644 --- a/packages/geo/src/lib/metadata/metadata-button/metadata-button.component.ts +++ b/packages/geo/src/lib/metadata/metadata-button/metadata-button.component.ts @@ -1,17 +1,16 @@ import { - Component, - Input, ChangeDetectionStrategy, + Component, Inject, + Input, ViewEncapsulation } from '@angular/core'; -import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog'; import { Layer } from '../../layer/shared/layers/layer'; - import { - MetadataOptions, - MetadataLayerOptions + MetadataLayerOptions, + MetadataOptions } from '../shared/metadata.interface'; import { MetadataService } from '../shared/metadata.service'; diff --git a/packages/geo/src/lib/metadata/metadata.module.ts b/packages/geo/src/lib/metadata/metadata.module.ts index 1293bb9590..131e359c2c 100644 --- a/packages/geo/src/lib/metadata/metadata.module.ts +++ b/packages/geo/src/lib/metadata/metadata.module.ts @@ -1,16 +1,15 @@ -import { MatDialogModule } from '@angular/material/dialog'; -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; import { IgoLanguageModule } from '@igo2/core'; import { - MetadataButtonComponent, - MetadataAbstractComponent + MetadataAbstractComponent, + MetadataButtonComponent } from './metadata-button/metadata-button.component'; @NgModule({ diff --git a/packages/geo/src/lib/metadata/shared/metadata.service.spec.ts b/packages/geo/src/lib/metadata/shared/metadata.service.spec.ts index 83d3b0da09..caec0586a0 100644 --- a/packages/geo/src/lib/metadata/shared/metadata.service.spec.ts +++ b/packages/geo/src/lib/metadata/shared/metadata.service.spec.ts @@ -1,5 +1,5 @@ -import { TestBed, inject } from '@angular/core/testing'; import { HttpClientModule } from '@angular/common/http'; +import { TestBed, inject } from '@angular/core/testing'; import { MetadataService } from './metadata.service'; diff --git a/packages/geo/src/lib/offline/geoDB/configFileToGeoDB.service.ts b/packages/geo/src/lib/offline/geoDB/configFileToGeoDB.service.ts index 1dfc7f2cc7..5a0ab71dae 100644 --- a/packages/geo/src/lib/offline/geoDB/configFileToGeoDB.service.ts +++ b/packages/geo/src/lib/offline/geoDB/configFileToGeoDB.service.ts @@ -1,12 +1,15 @@ +import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; + import { MessageService } from '@igo2/core'; -import { HttpClient } from '@angular/common/http'; -import { catchError, concatMap } from 'rxjs/operators'; -import { GeoDBService } from './geoDB.service'; -import { of, zip } from 'rxjs'; -import { DatasToIDB, GeoDBData } from './geoDB.interface'; + import { default as JSZip } from 'jszip'; +import { of, zip } from 'rxjs'; +import { catchError, concatMap } from 'rxjs/operators'; + import { InsertSourceInsertDBEnum } from './geoDB.enums'; +import { DatasToIDB, GeoDBData } from './geoDB.interface'; +import { GeoDBService } from './geoDB.service'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/offline/geoDB/geoDB.service.ts b/packages/geo/src/lib/offline/geoDB/geoDB.service.ts index 06eadcf497..79abfa741f 100644 --- a/packages/geo/src/lib/offline/geoDB/geoDB.service.ts +++ b/packages/geo/src/lib/offline/geoDB/geoDB.service.ts @@ -1,10 +1,13 @@ import { Injectable } from '@angular/core'; + +import { CompressionService } from '@igo2/core'; + import { DBMode, NgxIndexedDBService } from 'ngx-indexed-db'; -import { Observable, of, Subject } from 'rxjs'; +import { Observable, Subject, of } from 'rxjs'; import { concatMap, first, map, take } from 'rxjs/operators'; -import { CompressionService } from '@igo2/core'; -import { GeoDBData } from './geoDB.interface'; + import { InsertSourceInsertDBEnum } from './geoDB.enums'; +import { GeoDBData } from './geoDB.interface'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/offline/layerDB/layerDB.service.ts b/packages/geo/src/lib/offline/layerDB/layerDB.service.ts index de6d9482f8..f15378b45e 100644 --- a/packages/geo/src/lib/offline/layerDB/layerDB.service.ts +++ b/packages/geo/src/lib/offline/layerDB/layerDB.service.ts @@ -1,7 +1,9 @@ import { Injectable } from '@angular/core'; + import { NgxIndexedDBService } from 'ngx-indexed-db'; -import { Observable, of, Subject } from 'rxjs'; +import { Observable, Subject, of } from 'rxjs'; import { concatMap, first } from 'rxjs/operators'; + import { LayerDBData } from './layerDB.interface'; @Injectable({ diff --git a/packages/geo/src/lib/offline/shared/geo-network.service.ts b/packages/geo/src/lib/offline/shared/geo-network.service.ts index f7cd9145f5..8f6873242f 100644 --- a/packages/geo/src/lib/offline/shared/geo-network.service.ts +++ b/packages/geo/src/lib/offline/shared/geo-network.service.ts @@ -1,9 +1,13 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; + import { ConnectionState, NetworkService } from '@igo2/core'; + +import { Type } from 'ol/format/Feature'; + import { Observable } from 'rxjs'; + import { GeoDBService } from '../geoDB/geoDB.service'; -import { Type } from 'ol/format/Feature'; export enum ResponseType { Arraybuffer = 'arraybuffer', diff --git a/packages/geo/src/lib/overlay/overlay.module.ts b/packages/geo/src/lib/overlay/overlay.module.ts index d38ca0963f..77b49af5a8 100644 --- a/packages/geo/src/lib/overlay/overlay.module.ts +++ b/packages/geo/src/lib/overlay/overlay.module.ts @@ -1,4 +1,4 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { OverlayDirective } from './shared/overlay.directive'; diff --git a/packages/geo/src/lib/overlay/shared/overlay.directive.ts b/packages/geo/src/lib/overlay/shared/overlay.directive.ts index ebcfeae9ec..bd3748f661 100644 --- a/packages/geo/src/lib/overlay/shared/overlay.directive.ts +++ b/packages/geo/src/lib/overlay/shared/overlay.directive.ts @@ -1,14 +1,14 @@ -import { Directive, Self, OnInit, OnDestroy } from '@angular/core'; -import { Subscription } from 'rxjs'; +import { Directive, OnDestroy, OnInit, Self } from '@angular/core'; import olFormatGeoJSON from 'ol/format/GeoJSON'; -import { IgoMap } from '../../map/shared/map'; -import { MapBrowserComponent } from '../../map/map-browser/map-browser.component'; -import { Feature } from '../../feature/shared/feature.interfaces'; +import { Subscription } from 'rxjs'; -import { OverlayService } from '../shared/overlay.service'; +import { Feature } from '../../feature/shared/feature.interfaces'; +import { MapBrowserComponent } from '../../map/map-browser/map-browser.component'; +import { IgoMap } from '../../map/shared/map'; import { OverlayAction } from '../shared/overlay.enum'; +import { OverlayService } from '../shared/overlay.service'; @Directive({ selector: '[igoOverlay]' diff --git a/packages/geo/src/lib/overlay/shared/overlay.service.ts b/packages/geo/src/lib/overlay/shared/overlay.service.ts index cf20697397..304282d76a 100644 --- a/packages/geo/src/lib/overlay/shared/overlay.service.ts +++ b/packages/geo/src/lib/overlay/shared/overlay.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; + import { BehaviorSubject } from 'rxjs'; import { Feature } from '../../feature/shared/feature.interfaces'; - import { OverlayAction } from './overlay.enum'; @Injectable({ diff --git a/packages/geo/src/lib/overlay/shared/overlay.ts b/packages/geo/src/lib/overlay/shared/overlay.ts index 0bc81409cc..0dc26f5b0c 100644 --- a/packages/geo/src/lib/overlay/shared/overlay.ts +++ b/packages/geo/src/lib/overlay/shared/overlay.ts @@ -1,17 +1,16 @@ import OlFeature from 'ol/Feature'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import { FeatureDataSource } from '../../datasource'; import { Feature, FeatureMotion, featureToOl, moveToOlFeatures } from '../../feature/shared'; -import { FeatureDataSource } from '../../datasource'; import { VectorLayer } from '../../layer/shared/layers/vector-layer'; - -import { createOverlayLayer } from './overlay.utils'; import { MapBase } from '../../map/shared/map.abstract'; +import { createOverlayLayer } from './overlay.utils'; /** * This class is simply a shortcut for adding features to a map. diff --git a/packages/geo/src/lib/print/print-form/print-form.component.ts b/packages/geo/src/lib/print/print-form/print-form.component.ts index 3f46c5f720..33bb75594d 100644 --- a/packages/geo/src/lib/print/print-form/print-form.component.ts +++ b/packages/geo/src/lib/print/print-form/print-form.component.ts @@ -1,21 +1,21 @@ -import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { - UntypedFormGroup, UntypedFormBuilder, UntypedFormControl, + UntypedFormGroup, Validators } from '@angular/forms'; + import { BehaviorSubject } from 'rxjs'; import { PrintOptions } from '../shared/print.interface'; - import { + PrintLegendPosition, + PrintOrientation, PrintOutputFormat, PrintPaperFormat, - PrintOrientation, PrintResolution, - PrintSaveImageFormat, - PrintLegendPosition + PrintSaveImageFormat } from '../shared/print.type'; @Component({ diff --git a/packages/geo/src/lib/print/print.module.ts b/packages/geo/src/lib/print/print.module.ts index 01b2112b82..042bf6415b 100644 --- a/packages/geo/src/lib/print/print.module.ts +++ b/packages/geo/src/lib/print/print.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatOptionModule } from '@angular/material/core'; @@ -9,11 +9,11 @@ import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { IgoLanguageModule } from '@igo2/core'; import { IgoKeyValueModule } from '@igo2/common'; +import { IgoLanguageModule } from '@igo2/core'; -import { PrintComponent } from './print/print.component'; import { PrintFormComponent } from './print-form/print-form.component'; +import { PrintComponent } from './print/print.component'; @NgModule({ imports: [ diff --git a/packages/geo/src/lib/print/print/print.component.ts b/packages/geo/src/lib/print/print/print.component.ts index 5447e744a0..6704799fc2 100644 --- a/packages/geo/src/lib/print/print/print.component.ts +++ b/packages/geo/src/lib/print/print/print.component.ts @@ -1,21 +1,20 @@ import { Component, Input } from '@angular/core'; + import { BehaviorSubject } from 'rxjs'; import { take } from 'rxjs/operators'; import { IgoMap } from '../../map/shared/map'; import { PrintOptions } from '../shared/print.interface'; - +import { PrintService } from '../shared/print.service'; import { + PrintLegendPosition, + PrintOrientation, PrintOutputFormat, PrintPaperFormat, - PrintOrientation, PrintResolution, - PrintSaveImageFormat, - PrintLegendPosition + PrintSaveImageFormat } from '../shared/print.type'; -import { PrintService } from '../shared/print.service'; - @Component({ selector: 'igo-print', templateUrl: './print.component.html' diff --git a/packages/geo/src/lib/print/shared/print.interface.ts b/packages/geo/src/lib/print/shared/print.interface.ts index 8b476420ff..9020ec6e3d 100644 --- a/packages/geo/src/lib/print/shared/print.interface.ts +++ b/packages/geo/src/lib/print/shared/print.interface.ts @@ -1,10 +1,10 @@ import { + PrintLegendPosition, + PrintOrientation, PrintOutputFormat, PrintPaperFormat, - PrintOrientation, PrintResolution, - PrintSaveImageFormat, - PrintLegendPosition + PrintSaveImageFormat } from './print.type'; export interface PrintOptions { diff --git a/packages/geo/src/lib/print/shared/print.service.ts b/packages/geo/src/lib/print/shared/print.service.ts index 71273ba04c..be4f6a4713 100644 --- a/packages/geo/src/lib/print/shared/print.service.ts +++ b/packages/geo/src/lib/print/shared/print.service.ts @@ -1,30 +1,28 @@ -import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; -import { Observable, Subject, forkJoin } from 'rxjs'; -import { map as rxMap } from 'rxjs/operators'; - -import { saveAs } from 'file-saver'; -import jsPDF from 'jspdf'; -import html2canvas from 'html2canvas'; -import { default as JSZip } from 'jszip'; - -import { SubjectStatus } from '@igo2/utils'; import { SecureImagePipe } from '@igo2/common'; import { - MessageService, ActivityService, + ConfigService, LanguageService, - ConfigService + MessageService } from '@igo2/core'; +import { SubjectStatus } from '@igo2/utils'; + +import { saveAs } from 'file-saver'; +import html2canvas from 'html2canvas'; +import jsPDF from 'jspdf'; +import { default as JSZip } from 'jszip'; +import { Observable, Subject, forkJoin } from 'rxjs'; +import { map as rxMap } from 'rxjs/operators'; -import { IgoMap } from '../../map/shared/map'; -import { formatScale } from '../../map/shared/map.utils'; import { LegendMapViewOptions } from '../../layer/shared/layers/legend.interface'; import { getLayersLegends } from '../../layer/utils/outputLegend'; - -import { PrintOptions, TextPdfSizeAndMargin } from './print.interface'; +import { IgoMap } from '../../map/shared/map'; +import { formatScale } from '../../map/shared/map.utils'; import GeoPdfPlugin from './geopdf'; +import { PrintOptions, TextPdfSizeAndMargin } from './print.interface'; import { PrintLegendPosition, PrintPaperFormat, diff --git a/packages/geo/src/lib/query/query.module.ts b/packages/geo/src/lib/query/query.module.ts index 3c6667b650..75dd244704 100644 --- a/packages/geo/src/lib/query/query.module.ts +++ b/packages/geo/src/lib/query/query.module.ts @@ -1,11 +1,11 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { IgoLanguageModule, IgoMessageModule } from '@igo2/core'; +import { provideQuerySearchSource } from './shared/query-search-source.providers'; import { QueryDirective } from './shared/query.directive'; import { QueryService } from './shared/query.service'; -import { provideQuerySearchSource } from './shared/query-search-source.providers'; @NgModule({ imports: [CommonModule, IgoLanguageModule, IgoMessageModule], diff --git a/packages/geo/src/lib/query/shared/query-search-source.providers.ts b/packages/geo/src/lib/query/shared/query-search-source.providers.ts index 23f6afc893..795cab810c 100644 --- a/packages/geo/src/lib/query/shared/query-search-source.providers.ts +++ b/packages/geo/src/lib/query/shared/query-search-source.providers.ts @@ -1,7 +1,6 @@ import { ConfigService } from '@igo2/core'; import { SearchSource } from '../../search/shared/sources/source'; - import { QuerySearchSource } from './query-search-source'; /** diff --git a/packages/geo/src/lib/query/shared/query-search-source.ts b/packages/geo/src/lib/query/shared/query-search-source.ts index f8548d8ce0..ea457495b0 100644 --- a/packages/geo/src/lib/query/shared/query-search-source.ts +++ b/packages/geo/src/lib/query/shared/query-search-source.ts @@ -1,8 +1,9 @@ -import { Injectable, Inject } from '@angular/core'; +import { Inject, Injectable } from '@angular/core'; import { FEATURE } from '../../feature/shared/feature.enums'; import { SearchSource } from '../../search/shared/sources/source'; import { SearchSourceOptions } from '../../search/shared/sources/source.interfaces'; + /** * Map search source. For now it has no search capability. All it does * is act as a placeholder for the map query results' "search source". diff --git a/packages/geo/src/lib/query/shared/query.directive.ts b/packages/geo/src/lib/query/shared/query.directive.ts index c14be7a2c5..90a58b4fe0 100644 --- a/packages/geo/src/lib/query/shared/query.directive.ts +++ b/packages/geo/src/lib/query/shared/query.directive.ts @@ -1,37 +1,36 @@ import { + AfterViewInit, Directive, - Input, - Output, EventEmitter, + Input, OnDestroy, - AfterViewInit, + Output, Self } from '@angular/core'; -import { Subscription, Observable, of, zip } from 'rxjs'; -import { unByKey } from 'ol/Observable'; - import OlFeature from 'ol/Feature'; -import OlRenderFeature from 'ol/render/Feature'; +import MapBrowserPointerEvent from 'ol/MapBrowserEvent'; +import { unByKey } from 'ol/Observable'; +import { EventsKey } from 'ol/events'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; import OlLayer from 'ol/layer/Layer'; +import OlRenderFeature from 'ol/render/Feature'; import OlSource from 'ol/source/Source'; import olVectorSource from 'ol/source/Vector'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; -import MapBrowserPointerEvent from 'ol/MapBrowserEvent'; -import { EventsKey } from 'ol/events'; +import { Observable, Subscription, of, zip } from 'rxjs'; -import { IgoMap } from '../../map/shared/map'; -import { MapBrowserComponent } from '../../map/map-browser/map-browser.component'; import { Feature } from '../../feature/shared/feature.interfaces'; import { renderFeatureFromOl } from '../../feature/shared/feature.utils'; import { featureFromOl } from '../../feature/shared/feature.utils'; -import { QueryService } from './query.service'; -import { layerIsQueryable, olLayerFeatureIsQueryable } from './query.utils'; -import { ctrlKeyDown } from '../../map/shared/map.utils'; import { OlDragSelectInteraction } from '../../feature/shared/strategies/selection'; import { VectorLayer } from '../../layer/shared/layers/vector-layer'; +import { MapBrowserComponent } from '../../map/map-browser/map-browser.component'; +import { IgoMap } from '../../map/shared/map'; +import { ctrlKeyDown } from '../../map/shared/map.utils'; import { QueryableDataSourceOptions } from './query.interfaces'; +import { QueryService } from './query.service'; +import { layerIsQueryable, olLayerFeatureIsQueryable } from './query.utils'; /** * This directive makes a map queryable with a click of with a drag box. diff --git a/packages/geo/src/lib/query/shared/query.interfaces.ts b/packages/geo/src/lib/query/shared/query.interfaces.ts index a1252c98b5..d98362150f 100644 --- a/packages/geo/src/lib/query/shared/query.interfaces.ts +++ b/packages/geo/src/lib/query/shared/query.interfaces.ts @@ -1,12 +1,11 @@ +import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olSource from 'ol/source/Source'; +import olSourceVector from 'ol/source/Vector'; + import { DataSource } from '../../datasource/shared/datasources/datasource'; import { DataSourceOptions } from '../../datasource/shared/datasources/datasource.interface'; - import { QueryFormat, QueryHtmlTarget } from './query.enums'; -import olSource from 'ol/source/Source'; -import olSourceVector from 'ol/source/Vector'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; - export interface QueryOptions { coordinates: [number, number]; projection: string; diff --git a/packages/geo/src/lib/query/shared/query.service.spec.ts b/packages/geo/src/lib/query/shared/query.service.spec.ts index 456050dcf7..cba55fa3bd 100644 --- a/packages/geo/src/lib/query/shared/query.service.spec.ts +++ b/packages/geo/src/lib/query/shared/query.service.spec.ts @@ -1,10 +1,11 @@ -import { TestBed, inject } from '@angular/core/testing'; import { HttpClientModule } from '@angular/common/http'; +import { TestBed, inject } from '@angular/core/testing'; + +import { IgoMessageModule } from '@igo2/core'; import { TranslateModule } from '@ngx-translate/core'; import { QueryService } from './query.service'; -import { IgoMessageModule } from '@igo2/core'; describe('QueryService', () => { beforeEach(() => { diff --git a/packages/geo/src/lib/query/shared/query.service.ts b/packages/geo/src/lib/query/shared/query.service.ts index a8723a18f5..218b17624d 100644 --- a/packages/geo/src/lib/query/shared/query.service.ts +++ b/packages/geo/src/lib/query/shared/query.service.ts @@ -1,34 +1,35 @@ -import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Observable, of } from 'rxjs'; -import { map, mergeMap } from 'rxjs/operators'; +import { Injectable } from '@angular/core'; -import { default as striptags } from 'striptags'; +import { LanguageService, MessageService } from '@igo2/core'; +import { uuid } from '@igo2/utils'; -import * as olformat from 'ol/format'; +import olFeature from 'ol/Feature'; import * as olextent from 'ol/extent'; +import * as olformat from 'ol/format'; +import olFormatEsriJSON from 'ol/format/EsriJSON'; import olFormatGML2 from 'ol/format/GML2'; import olFormatGML3 from 'ol/format/GML3'; -import olFormatEsriJSON from 'ol/format/EsriJSON'; -import olFeature from 'ol/Feature'; import * as olgeom from 'ol/geom'; -import { LanguageService, MessageService } from '@igo2/core'; -import { uuid } from '@igo2/utils'; +import { Observable, of } from 'rxjs'; +import { map, mergeMap } from 'rxjs/operators'; +import { default as striptags } from 'striptags'; + +import { + CartoDataSource, + ImageArcGISRestDataSource, + TileArcGISRestDataSource, + WMSDataSource, + WMSDataSourceOptions +} from '../../datasource'; +import { FEATURE } from '../../feature/shared/feature.enums'; import { Feature, FeatureGeometry } from '../../feature/shared/feature.interfaces'; -import { FEATURE } from '../../feature/shared/feature.enums'; import { Layer } from '../../layer/shared/layers/layer'; -import { - WMSDataSource, - CartoDataSource, - TileArcGISRestDataSource, - WMSDataSourceOptions, - ImageArcGISRestDataSource -} from '../../datasource'; - +import { MapExtent } from '../../map/shared/map.interface'; import { QueryFormat, QueryFormatMimeType, @@ -36,11 +37,10 @@ import { } from './query.enums'; import { QueryOptions, + QueryUrlData, QueryableDataSource, - QueryableDataSourceOptions, - QueryUrlData + QueryableDataSourceOptions } from './query.interfaces'; -import { MapExtent } from '../../map/shared/map.interface'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/search/search-bar/search-bar.component.ts b/packages/geo/src/lib/search/search-bar/search-bar.component.ts index 30048fc153..ac9082d620 100644 --- a/packages/geo/src/lib/search/search-bar/search-bar.component.ts +++ b/packages/geo/src/lib/search/search-bar/search-bar.component.ts @@ -1,28 +1,29 @@ import { - Component, - OnInit, - OnDestroy, ChangeDetectionStrategy, + Component, + ElementRef, + EventEmitter, Input, + OnDestroy, + OnInit, Output, - EventEmitter, - ViewChild, - ElementRef + ViewChild } from '@angular/core'; import { FloatLabelType, MatFormFieldAppearance } from '@angular/material/form-field'; -import { BehaviorSubject, Subscription, timer } from 'rxjs'; -import { debounce, distinctUntilChanged } from 'rxjs/operators'; -import { ConfigService } from '@igo2/core'; import { EntityStore } from '@igo2/common'; +import { ConfigService } from '@igo2/core'; + +import { BehaviorSubject, Subscription, timer } from 'rxjs'; +import { debounce, distinctUntilChanged } from 'rxjs/operators'; +import { SearchSourceService } from '../shared/search-source.service'; import { SEARCH_TYPES } from '../shared/search.enums'; -import { SearchResult, Research } from '../shared/search.interfaces'; +import { Research, SearchResult } from '../shared/search.interfaces'; import { SearchService } from '../shared/search.service'; -import { SearchSourceService } from '../shared/search-source.service'; /** * Searchbar that triggers a research in all search sources enabled. diff --git a/packages/geo/src/lib/search/search-bar/search-bar.module.ts b/packages/geo/src/lib/search/search-bar/search-bar.module.ts index 89fe33193a..d3d9ca45b9 100644 --- a/packages/geo/src/lib/search/search-bar/search-bar.module.ts +++ b/packages/geo/src/lib/search/search-bar/search-bar.module.ts @@ -1,7 +1,6 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; - import { MatButtonModule } from '@angular/material/button'; import { MatDividerModule } from '@angular/material/divider'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/packages/geo/src/lib/search/search-bar/search-url-param.directive.ts b/packages/geo/src/lib/search/search-bar/search-url-param.directive.ts index ea65cd52da..75d41a61e8 100644 --- a/packages/geo/src/lib/search/search-bar/search-url-param.directive.ts +++ b/packages/geo/src/lib/search/search-bar/search-url-param.directive.ts @@ -1,9 +1,9 @@ import { + ChangeDetectorRef, Directive, - Self, OnInit, Optional, - ChangeDetectorRef + Self } from '@angular/core'; import { RouteService } from '@igo2/core'; diff --git a/packages/geo/src/lib/search/search-results/save-feature-dialog.component.ts b/packages/geo/src/lib/search/search-results/save-feature-dialog.component.ts index 909e1b3573..713b2002fe 100644 --- a/packages/geo/src/lib/search/search-results/save-feature-dialog.component.ts +++ b/packages/geo/src/lib/search/search-results/save-feature-dialog.component.ts @@ -1,16 +1,19 @@ -import { LanguageService } from '@igo2/core'; -import { Component, OnInit, Optional, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { Component, Inject, OnInit, Optional } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; -import { Layer } from '../../layer/shared'; -import { SearchResult } from '../shared'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; + +import { LanguageService } from '@igo2/core'; + import { Observable } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; +import { Layer } from '../../layer/shared'; +import { SearchResult } from '../shared'; + @Component({ selector: 'igo-save-feature-dialog', templateUrl: './save-feature-dialog.component.html', diff --git a/packages/geo/src/lib/search/search-results/search-results-add-button.component.ts b/packages/geo/src/lib/search/search-results/search-results-add-button.component.ts index 9a90d0a070..b87dd6c44f 100644 --- a/packages/geo/src/lib/search/search-results/search-results-add-button.component.ts +++ b/packages/geo/src/lib/search/search-results/search-results-add-button.component.ts @@ -1,20 +1,25 @@ import { + ChangeDetectionStrategy, Component, Input, - ChangeDetectionStrategy, - OnInit, - OnDestroy + OnDestroy, + OnInit } from '@angular/core'; - -import { SearchResult } from '../shared/search.interfaces'; -import { IgoMap } from '../../map/shared/map'; -import { LayerOptions } from '../../layer/shared/layers/layer.interface'; -import { LayerService } from '../../layer/shared/layer.service'; -import { LAYER } from '../../layer/shared/layer.enums'; -import { Subscription, BehaviorSubject, take } from 'rxjs'; -import { SaveFeatureDialogComponent } from './save-feature-dialog.component'; import { MatDialog } from '@angular/material/dialog'; -import { VectorLayer } from '../../layer/shared/layers/vector-layer'; + +import { EntityStore } from '@igo2/common'; +import { Media, MediaService } from '@igo2/core'; + +import OlOverlay from 'ol/Overlay'; +import { default as OlGeometry } from 'ol/geom/Geometry'; +import { VectorSourceEvent as OlVectorSourceEvent } from 'ol/source/Vector'; +import Circle from 'ol/style/Circle'; +import Fill from 'ol/style/Fill'; +import Stroke from 'ol/style/Stroke'; +import Style from 'ol/style/Style'; + +import { BehaviorSubject, Subscription, take } from 'rxjs'; + import { DataSourceService, FeatureDataSource } from '../../datasource'; import { Feature, @@ -26,17 +31,15 @@ import { tryAddSelectionStrategy, tryBindStoreLayer } from '../../feature'; -import { EntityStore } from '@igo2/common'; +import { LAYER } from '../../layer/shared/layer.enums'; +import { LayerService } from '../../layer/shared/layer.service'; +import { LayerOptions } from '../../layer/shared/layers/layer.interface'; +import { VectorLayer } from '../../layer/shared/layers/vector-layer'; +import { IgoMap } from '../../map/shared/map'; import { getTooltipsOfOlGeometry } from '../../measure'; -import OlOverlay from 'ol/Overlay'; -import Stroke from 'ol/style/Stroke'; -import Fill from 'ol/style/Fill'; -import Style from 'ol/style/Style'; -import Circle from 'ol/style/Circle'; -import { VectorSourceEvent as OlVectorSourceEvent } from 'ol/source/Vector'; -import { default as OlGeometry } from 'ol/geom/Geometry'; import { QueryableDataSourceOptions } from '../../query/shared'; -import { Media, MediaService } from '@igo2/core'; +import { SearchResult } from '../shared/search.interfaces'; +import { SaveFeatureDialogComponent } from './save-feature-dialog.component'; @Component({ selector: 'igo-search-add-button', diff --git a/packages/geo/src/lib/search/search-results/search-results-item.component.ts b/packages/geo/src/lib/search/search-results/search-results-item.component.ts index bae105ac3d..3df161f365 100644 --- a/packages/geo/src/lib/search/search-results/search-results-item.component.ts +++ b/packages/geo/src/lib/search/search-results/search-results-item.component.ts @@ -1,21 +1,22 @@ import { - Component, - Input, ChangeDetectionStrategy, + Component, EventEmitter, + Input, Output } from '@angular/core'; -import olFormatGeoJSON from 'ol/format/GeoJSON'; import { + getEntityIcon, getEntityTitle, - getEntityTitleHtml, - getEntityIcon + getEntityTitleHtml } from '@igo2/common'; -import { SearchResult } from '../shared/search.interfaces'; +import olFormatGeoJSON from 'ol/format/GeoJSON'; + import { FeatureMotion, moveToOlFeatures } from '../../feature'; import { IgoMap } from '../../map/shared'; +import { SearchResult } from '../shared/search.interfaces'; /** * Search results list item diff --git a/packages/geo/src/lib/search/search-results/search-results.component.ts b/packages/geo/src/lib/search/search-results/search-results.component.ts index 577404b006..64643c1189 100644 --- a/packages/geo/src/lib/search/search-results/search-results.component.ts +++ b/packages/geo/src/lib/search/search-results/search-results.component.ts @@ -1,33 +1,32 @@ import { - Component, - Input, - Output, - EventEmitter, - ContentChild, ChangeDetectionStrategy, ChangeDetectorRef, + Component, + ContentChild, + EventEmitter, + Input, + OnDestroy, OnInit, - OnDestroy + Output } from '@angular/core'; import type { TemplateRef } from '@angular/core'; -import { Observable, EMPTY, timer, BehaviorSubject, Subscription } from 'rxjs'; -import { debounce, map } from 'rxjs/operators'; - -import { ConfigService } from '@igo2/core'; import { EntityState, EntityStoreFilterCustomFuncStrategy, EntityStoreWatcher, EntityStoreWithStrategy } from '@igo2/common'; +import { ConfigService } from '@igo2/core'; -import { IgoMap } from '../../map/shared'; +import { BehaviorSubject, EMPTY, Observable, Subscription, timer } from 'rxjs'; +import { debounce, map } from 'rxjs/operators'; -import { TextSearchOptions } from '../shared/sources/source.interfaces'; +import { IgoMap } from '../../map/shared'; +import { Research, SearchResult } from '../shared/search.interfaces'; import { SearchService } from '../shared/search.service'; -import { SearchResult, Research } from '../shared/search.interfaces'; import { SearchSource } from '../shared/sources/source'; +import { TextSearchOptions } from '../shared/sources/source.interfaces'; export enum SearchResultMode { Grouped = 'grouped', diff --git a/packages/geo/src/lib/search/search-results/search-results.module.ts b/packages/geo/src/lib/search/search-results/search-results.module.ts index 4536e5fbc5..e10d57e7cf 100644 --- a/packages/geo/src/lib/search/search-results/search-results.module.ts +++ b/packages/geo/src/lib/search/search-results/search-results.module.ts @@ -1,18 +1,17 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { NgModule } from '@angular/core'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatBadgeModule } from '@angular/material/badge'; import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; -import { MatListModule } from '@angular/material/list'; -import { MatTooltipModule } from '@angular/material/tooltip'; -import { MatTabsModule } from '@angular/material/tabs'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { ReactiveFormsModule } from '@angular/forms'; +import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; +import { MatListModule } from '@angular/material/list'; import { MatSelectModule } from '@angular/material/select'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatTabsModule } from '@angular/material/tabs'; +import { MatTooltipModule } from '@angular/material/tooltip'; import { IgoCollapsibleModule, @@ -23,10 +22,10 @@ import { import { IgoLanguageModule } from '@igo2/core'; import { IgoMetadataModule } from './../../metadata/metadata.module'; -import { SearchResultsComponent } from './search-results.component'; -import { SearchResultsItemComponent } from './search-results-item.component'; -import { SearchResultAddButtonComponent } from './search-results-add-button.component'; import { SaveFeatureDialogComponent } from './save-feature-dialog.component'; +import { SearchResultAddButtonComponent } from './search-results-add-button.component'; +import { SearchResultsItemComponent } from './search-results-item.component'; +import { SearchResultsComponent } from './search-results.component'; /** * @ignore diff --git a/packages/geo/src/lib/search/search-selector/search-selector.component.ts b/packages/geo/src/lib/search/search-selector/search-selector.component.ts index 23425a26a4..ebdde65cf8 100644 --- a/packages/geo/src/lib/search/search-selector/search-selector.component.ts +++ b/packages/geo/src/lib/search/search-selector/search-selector.component.ts @@ -1,18 +1,18 @@ import { + ChangeDetectionStrategy, Component, - Input, - Output, EventEmitter, - ChangeDetectionStrategy, + Input, + OnDestroy, OnInit, - OnDestroy + Output } from '@angular/core'; import { BehaviorSubject, Subscription } from 'rxjs'; import { distinctUntilChanged } from 'rxjs/operators'; -import { SEARCH_TYPES } from '../shared/search.enums'; import { SearchSourceService } from '../shared/search-source.service'; +import { SEARCH_TYPES } from '../shared/search.enums'; /** * This component allows a user to select a search type yo enable. In it's diff --git a/packages/geo/src/lib/search/search-selector/search-selector.module.ts b/packages/geo/src/lib/search/search-selector/search-selector.module.ts index d9f780bdf2..5e165e10c7 100644 --- a/packages/geo/src/lib/search/search-selector/search-selector.module.ts +++ b/packages/geo/src/lib/search/search-selector/search-selector.module.ts @@ -1,6 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatIconModule } from '@angular/material/icon'; diff --git a/packages/geo/src/lib/search/search-settings/search-settings.component.spec.ts b/packages/geo/src/lib/search/search-settings/search-settings.component.spec.ts index b31be2f170..fb5dc137e5 100644 --- a/packages/geo/src/lib/search/search-settings/search-settings.component.spec.ts +++ b/packages/geo/src/lib/search/search-settings/search-settings.component.spec.ts @@ -1,25 +1,27 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IgoLanguageModule } from '@igo2/core'; -import { SearchSettingsComponent } from './search-settings.component'; import { CommonModule } from '@angular/common'; +import { HttpClientModule } from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; +import { MatIconTestingModule } from '@angular/material/icon/testing'; import { MatMenuModule } from '@angular/material/menu'; import { MatRadioModule } from '@angular/material/radio'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { MatIconTestingModule } from '@angular/material/icon/testing'; + +import { IgoLanguageModule } from '@igo2/core'; + +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateHttpLoader } from '@ngx-translate/http-loader'; import { SearchSourceService } from '../shared/search-source.service'; -import { provideDefaultIChercheSearchResultFormatter } from '../shared/sources/icherche.providers'; import { provideDefaultCoordinatesSearchResultFormatter } from '../shared/sources/coordinates.providers'; +import { provideDefaultIChercheSearchResultFormatter } from '../shared/sources/icherche.providers'; import { provideILayerSearchResultFormatter } from '../shared/sources/ilayer.providers'; -import { HttpClientModule } from '@angular/common/http'; -import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; -import { HttpClient } from '@angular/common/http'; -import { TranslateHttpLoader } from '@ngx-translate/http-loader'; +import { SearchSettingsComponent } from './search-settings.component'; // AoT requires an exported function for factories export function HttpLoaderFactory(httpClient: HttpClient) { diff --git a/packages/geo/src/lib/search/search-settings/search-settings.component.ts b/packages/geo/src/lib/search/search-settings/search-settings.component.ts index e346266892..a0fd400d34 100644 --- a/packages/geo/src/lib/search/search-settings/search-settings.component.ts +++ b/packages/geo/src/lib/search/search-settings/search-settings.component.ts @@ -1,28 +1,28 @@ -import { MatCheckboxChange } from '@angular/material/checkbox'; -import { MatRadioChange } from '@angular/material/radio'; - import { + ChangeDetectionStrategy, Component, - Output, EventEmitter, - ChangeDetectionStrategy, - OnInit, HostListener, - Input + Input, + OnInit, + Output } from '@angular/core'; +import { MatCheckboxChange } from '@angular/material/checkbox'; +import { MatRadioChange } from '@angular/material/radio'; + +import { MediaService, StorageService } from '@igo2/core'; import { SearchSourceService } from '../shared/search-source.service'; +import { + sourceCanReverseSearch, + sourceCanReverseSearchAsSummary, + sourceCanSearch +} from '../shared/search.utils'; import { SearchSource } from '../shared/sources/source'; import { SearchSourceSettings, SettingOptions } from '../shared/sources/source.interfaces'; -import { - sourceCanReverseSearchAsSummary, - sourceCanSearch, - sourceCanReverseSearch -} from '../shared/search.utils'; -import { MediaService, StorageService } from '@igo2/core'; /** * This component allows a user to select a search type yo enable. In it's diff --git a/packages/geo/src/lib/search/search-settings/search-settings.module.ts b/packages/geo/src/lib/search/search-settings/search-settings.module.ts index ec2b368d97..7a7143ad28 100644 --- a/packages/geo/src/lib/search/search-settings/search-settings.module.ts +++ b/packages/geo/src/lib/search/search-settings/search-settings.module.ts @@ -1,6 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { SearchSettingsComponent } from './search-settings.component'; +import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatDividerModule } from '@angular/material/divider'; @@ -12,6 +11,8 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import { IgoLanguageModule } from '@igo2/core'; +import { SearchSettingsComponent } from './search-settings.component'; + /** * @ignore */ diff --git a/packages/geo/src/lib/search/search.module.ts b/packages/geo/src/lib/search/search.module.ts index d67190fbd3..1f62dea7c2 100644 --- a/packages/geo/src/lib/search/search.module.ts +++ b/packages/geo/src/lib/search/search.module.ts @@ -1,17 +1,16 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; - -import { SearchService } from './shared/search.service'; -import { provideSearchSourceService } from './shared/search-source-service.providers'; -import { provideDefaultIChercheSearchResultFormatter } from './shared/sources/icherche.providers'; -import { provideDefaultCoordinatesSearchResultFormatter } from './shared/sources/coordinates.providers'; -import { provideILayerSearchResultFormatter } from './shared/sources/ilayer.providers'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { IgoSearchBarModule } from './search-bar/search-bar.module'; -import { IgoSearchSelectorModule } from './search-selector/search-selector.module'; import { IgoSearchResultsModule } from './search-results/search-results.module'; +import { IgoSearchSelectorModule } from './search-selector/search-selector.module'; import { IgoSearchSettingsModule } from './search-settings/search-settings.module'; import { SearchPointerSummaryDirective } from './shared/search-pointer-summary.directive'; +import { provideSearchSourceService } from './shared/search-source-service.providers'; +import { SearchService } from './shared/search.service'; +import { provideDefaultCoordinatesSearchResultFormatter } from './shared/sources/coordinates.providers'; +import { provideDefaultIChercheSearchResultFormatter } from './shared/sources/icherche.providers'; +import { provideILayerSearchResultFormatter } from './shared/sources/ilayer.providers'; @NgModule({ imports: [ diff --git a/packages/geo/src/lib/search/shared/search-pointer-summary.directive.ts b/packages/geo/src/lib/search/shared/search-pointer-summary.directive.ts index f608539b58..c57ba2dd09 100644 --- a/packages/geo/src/lib/search/shared/search-pointer-summary.directive.ts +++ b/packages/geo/src/lib/search/shared/search-pointer-summary.directive.ts @@ -1,41 +1,40 @@ -import { FeatureGeometry } from './../../feature/shared/feature.interfaces'; import { + AfterContentChecked, Directive, + HostListener, Input, OnDestroy, - Self, OnInit, - AfterContentChecked, - HostListener + Self } from '@angular/core'; -import { Subscription, first } from 'rxjs'; - -import MapBrowserPointerEvent from 'ol/MapBrowserEvent'; - -import { IgoMap } from '../../map/shared/map'; -import { MapBrowserComponent } from '../../map/map-browser/map-browser.component'; -import { Feature } from '../../feature/shared/feature.interfaces'; -import { SearchService } from './search.service'; +import { EntityStore } from '@igo2/common'; +import { MediaService } from '@igo2/core'; +import { SubjectStatus } from '@igo2/utils'; import olFeature from 'ol/Feature'; -import { transform } from 'ol/proj'; -import * as olgeom from 'ol/geom'; +import MapBrowserPointerEvent from 'ol/MapBrowserEvent'; +import { unByKey } from 'ol/Observable'; import OlGeoJSON from 'ol/format/GeoJSON'; +import * as olgeom from 'ol/geom'; +import { transform } from 'ol/proj'; + +import { Subscription, first } from 'rxjs'; -import { SearchResult, Research } from './search.interfaces'; -import { EntityStore } from '@igo2/common'; import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource'; -import { VectorLayer } from '../../layer/shared/layers/vector-layer'; import { tryBindStoreLayer } from '../../feature/shared/feature-store.utils'; +import { FEATURE, FeatureMotion } from '../../feature/shared/feature.enums'; +import { Feature } from '../../feature/shared/feature.interfaces'; import { FeatureStore } from '../../feature/shared/store'; -import { FeatureMotion, FEATURE } from '../../feature/shared/feature.enums'; +import { VectorLayer } from '../../layer/shared/layers/vector-layer'; +import { MapBrowserComponent } from '../../map/map-browser/map-browser.component'; +import { IgoMap } from '../../map/shared/map'; +import { pointerPositionSummaryMarkerStyle } from '../../style/shared/feature/feature-style'; +import { FeatureGeometry } from './../../feature/shared/feature.interfaces'; import { SearchSourceService } from './search-source.service'; +import { Research, SearchResult } from './search.interfaces'; +import { SearchService } from './search.service'; import { sourceCanReverseSearchAsSummary } from './search.utils'; -import { MediaService } from '@igo2/core'; -import { unByKey } from 'ol/Observable'; -import { pointerPositionSummaryMarkerStyle } from '../../style/shared/feature/feature-style'; -import { SubjectStatus } from '@igo2/utils'; /** * This directive makes the mouse coordinate trigger a reverse search on available search sources. diff --git a/packages/geo/src/lib/search/shared/search-source-service.providers.ts b/packages/geo/src/lib/search/shared/search-source-service.providers.ts index a66b8dad15..2fa98bac29 100644 --- a/packages/geo/src/lib/search/shared/search-source-service.providers.ts +++ b/packages/geo/src/lib/search/shared/search-source-service.providers.ts @@ -1,5 +1,5 @@ -import { SearchSource } from './sources/source'; import { SearchSourceService } from './search-source.service'; +import { SearchSource } from './sources/source'; /** * Search source factory diff --git a/packages/geo/src/lib/search/shared/search-source.service.ts b/packages/geo/src/lib/search/shared/search-source.service.ts index 60e05a8e9c..0622eedd99 100644 --- a/packages/geo/src/lib/search/shared/search-source.service.ts +++ b/packages/geo/src/lib/search/shared/search-source.service.ts @@ -1,4 +1,5 @@ import { Workspace } from '@igo2/common'; + import { SearchSource } from './sources/source'; import { SearchSourceSettings } from './sources/source.interfaces'; diff --git a/packages/geo/src/lib/search/shared/search.interfaces.ts b/packages/geo/src/lib/search/shared/search.interfaces.ts index bf3eedeee0..debcf7f498 100644 --- a/packages/geo/src/lib/search/shared/search.interfaces.ts +++ b/packages/geo/src/lib/search/shared/search.interfaces.ts @@ -1,8 +1,8 @@ import { Observable } from 'rxjs'; import { CommonVectorStyleOptions } from '../../style/shared/vector/vector-style.interface'; -import { SearchSource } from './sources/source'; import { ReverseSearchOptions, TextSearchOptions } from './sources'; +import { SearchSource } from './sources/source'; export interface Research { request: Observable; diff --git a/packages/geo/src/lib/search/shared/search.service.ts b/packages/geo/src/lib/search/shared/search.service.ts index dd702ef70b..a07e4f067a 100644 --- a/packages/geo/src/lib/search/shared/search.service.ts +++ b/packages/geo/src/lib/search/shared/search.service.ts @@ -1,21 +1,21 @@ import { Injectable } from '@angular/core'; +import { StorageService } from '@igo2/core'; + import { stringToLonLat } from '../../map/shared'; import { MapService } from '../../map/shared/map.service'; - -import { SearchSource } from './sources/source'; -import { - TextSearchOptions, - ReverseSearchOptions -} from './sources/source.interfaces'; import { SearchSourceService } from './search-source.service'; -import { Research, TextSearch, ReverseSearch } from './search.interfaces'; +import { Research, ReverseSearch, TextSearch } from './search.interfaces'; import { - sourceCanSearch, sourceCanReverseSearch, - sourceCanReverseSearchAsSummary + sourceCanReverseSearchAsSummary, + sourceCanSearch } from './search.utils'; -import { StorageService } from '@igo2/core'; +import { SearchSource } from './sources/source'; +import { + ReverseSearchOptions, + TextSearchOptions +} from './sources/source.interfaces'; /** * This service perform researches in all the search sources enabled. diff --git a/packages/geo/src/lib/search/shared/search.utils.ts b/packages/geo/src/lib/search/shared/search.utils.ts index b1a6b31831..e6649dd38e 100644 --- a/packages/geo/src/lib/search/shared/search.utils.ts +++ b/packages/geo/src/lib/search/shared/search.utils.ts @@ -1,7 +1,7 @@ import { FEATURE } from '../../feature/shared/feature.enums'; import { Feature } from '../../feature/shared/feature.interfaces'; -import { SearchSource } from './sources/source'; import { SearchResult } from './search.interfaces'; +import { SearchSource } from './sources/source'; /** * Function that checks whether a search source implements TextSearch diff --git a/packages/geo/src/lib/search/shared/sources/cadastre.providers.ts b/packages/geo/src/lib/search/shared/sources/cadastre.providers.ts index 1e32113470..1a433bcc7a 100644 --- a/packages/geo/src/lib/search/shared/sources/cadastre.providers.ts +++ b/packages/geo/src/lib/search/shared/sources/cadastre.providers.ts @@ -2,8 +2,8 @@ import { HttpClient } from '@angular/common/http'; import { ConfigService, LanguageService, StorageService } from '@igo2/core'; -import { SearchSource } from './source'; import { CadastreSearchSource } from './cadastre'; +import { SearchSource } from './source'; /** * Cadastre search source factory diff --git a/packages/geo/src/lib/search/shared/sources/cadastre.ts b/packages/geo/src/lib/search/shared/sources/cadastre.ts index 43eec98c35..5341178011 100644 --- a/packages/geo/src/lib/search/shared/sources/cadastre.ts +++ b/packages/geo/src/lib/search/shared/sources/cadastre.ts @@ -1,23 +1,22 @@ -import { Injectable, Inject } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; +import { Inject, Injectable } from '@angular/core'; -import { Observable, of } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { LanguageService, StorageService } from '@igo2/core'; +import { customCacheHasher } from '@igo2/utils'; import olWKT from 'ol/format/WKT'; -import { FEATURE, Feature, FeatureGeometry } from '../../../feature'; +import { GeoJsonGeometryTypes } from 'geojson'; +import { Observable, of } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { Cacheable } from 'ts-cacheable'; +import { FEATURE, Feature, FeatureGeometry } from '../../../feature'; import { SearchResult, TextSearch } from '../search.interfaces'; +import { computeTermSimilarity } from '../search.utils'; import { SearchSource } from './source'; import { SearchSourceOptions, TextSearchOptions } from './source.interfaces'; -import { LanguageService, StorageService } from '@igo2/core'; -import { computeTermSimilarity } from '../search.utils'; -import { Cacheable } from 'ts-cacheable'; -import { GeoJsonGeometryTypes } from 'geojson'; -import { customCacheHasher } from '@igo2/utils'; - /** * Cadastre search source */ diff --git a/packages/geo/src/lib/search/shared/sources/coordinates.providers.ts b/packages/geo/src/lib/search/shared/sources/coordinates.providers.ts index 73443f122b..b14f6e2f73 100644 --- a/packages/geo/src/lib/search/shared/sources/coordinates.providers.ts +++ b/packages/geo/src/lib/search/shared/sources/coordinates.providers.ts @@ -1,12 +1,12 @@ import { ConfigService, LanguageService, StorageService } from '@igo2/core'; -import { SearchSource } from './source'; +import { Projection } from '../../../map/shared/projection.interfaces'; +import { ProjectionService } from '../../../map/shared/projection.service'; import { CoordinatesReverseSearchSource, CoordinatesSearchResultFormatter } from './coordinates'; -import { Projection } from '../../../map/shared/projection.interfaces'; -import { ProjectionService } from '../../../map/shared/projection.service'; +import { SearchSource } from './source'; /** * Coordinate search result formatter factory diff --git a/packages/geo/src/lib/search/shared/sources/coordinates.ts b/packages/geo/src/lib/search/shared/sources/coordinates.ts index 7e638cea53..8bb5f32e65 100644 --- a/packages/geo/src/lib/search/shared/sources/coordinates.ts +++ b/packages/geo/src/lib/search/shared/sources/coordinates.ts @@ -1,26 +1,27 @@ -import { Injectable, Inject } from '@angular/core'; -import { Observable, BehaviorSubject, of } from 'rxjs'; -import * as olproj from 'ol/proj'; -import { fromCircle } from 'ol/geom/Polygon'; -import OlCircle from 'ol/geom/Circle'; -import * as olformat from 'ol/format'; +import { Inject, Injectable } from '@angular/core'; -import { FEATURE, Feature, FeatureGeometry } from '../../../feature'; +import { LanguageService, StorageService } from '@igo2/core'; -import { SearchResult, ReverseSearch } from '../search.interfaces'; -import { SearchSource } from './source'; -import { SearchSourceOptions, ReverseSearchOptions } from './source.interfaces'; +import * as olformat from 'ol/format'; +import OlCircle from 'ol/geom/Circle'; +import { fromCircle } from 'ol/geom/Polygon'; +import * as olproj from 'ol/proj'; -import { LanguageService, StorageService } from '@igo2/core'; -import { GoogleLinks } from '../../../utils/googleLinks'; -import { Projection } from '../../../map/shared/projection.interfaces'; +import { BehaviorSubject, Observable, of } from 'rxjs'; +import { Cacheable } from 'ts-cacheable'; + +import { FEATURE, Feature, FeatureGeometry } from '../../../feature'; import { + convertDDToDMS, lonLatConversion, - roundCoordTo, - convertDDToDMS + roundCoordTo } from '../../../map/shared/map.utils'; +import { Projection } from '../../../map/shared/projection.interfaces'; import { OsmLinks } from '../../../utils'; -import { Cacheable } from 'ts-cacheable'; +import { GoogleLinks } from '../../../utils/googleLinks'; +import { ReverseSearch, SearchResult } from '../search.interfaces'; +import { SearchSource } from './source'; +import { ReverseSearchOptions, SearchSourceOptions } from './source.interfaces'; @Injectable() export class CoordinatesSearchResultFormatter { diff --git a/packages/geo/src/lib/search/shared/sources/icherche.providers.ts b/packages/geo/src/lib/search/shared/sources/icherche.providers.ts index 48d47e1a41..bbce150e65 100644 --- a/packages/geo/src/lib/search/shared/sources/icherche.providers.ts +++ b/packages/geo/src/lib/search/shared/sources/icherche.providers.ts @@ -1,14 +1,14 @@ -import { Injector } from '@angular/core'; import { HttpClient } from '@angular/common/http'; +import { Injector } from '@angular/core'; import { ConfigService, LanguageService, StorageService } from '@igo2/core'; -import { SearchSource } from './source'; import { - IChercheSearchSource, + IChercheReverseSearchSource, IChercheSearchResultFormatter, - IChercheReverseSearchSource + IChercheSearchSource } from './icherche'; +import { SearchSource } from './source'; /** * ICherche search result formatter factory diff --git a/packages/geo/src/lib/search/shared/sources/icherche.ts b/packages/geo/src/lib/search/shared/sources/icherche.ts index d06f611f1b..e1b366412e 100644 --- a/packages/geo/src/lib/search/shared/sources/icherche.ts +++ b/packages/geo/src/lib/search/shared/sources/icherche.ts @@ -1,38 +1,36 @@ -import { Injectable, Inject, Injector } from '@angular/core'; import { HttpClient, - HttpParams, - HttpParameterCodec + HttpParameterCodec, + HttpParams } from '@angular/common/http'; - -import { Observable, of, BehaviorSubject } from 'rxjs'; -import { map, catchError } from 'rxjs/operators'; +import { Inject, Injectable, Injector } from '@angular/core'; import { AuthService } from '@igo2/auth'; import { LanguageService, StorageService } from '@igo2/core'; import { ObjectUtils, customCacheHasher } from '@igo2/utils'; import pointOnFeature from '@turf/point-on-feature'; +import { BehaviorSubject, Observable, of } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; +import { Cacheable } from 'ts-cacheable'; import { FEATURE, Feature } from '../../../feature'; +import { ReverseSearch, SearchResult, TextSearch } from '../search.interfaces'; +import { computeTermSimilarity } from '../search.utils'; import { GoogleLinks } from './../../../utils/googleLinks'; - -import { SearchResult, TextSearch, ReverseSearch } from '../search.interfaces'; -import { SearchSource } from './source'; -import { - SearchSourceOptions, - TextSearchOptions, - ReverseSearchOptions, - SearchSourceSettings -} from './source.interfaces'; import { IChercheData, IChercheResponse, IChercheReverseData, IChercheReverseResponse } from './icherche.interfaces'; -import { computeTermSimilarity } from '../search.utils'; -import { Cacheable } from 'ts-cacheable'; +import { SearchSource } from './source'; +import { + ReverseSearchOptions, + SearchSourceOptions, + SearchSourceSettings, + TextSearchOptions +} from './source.interfaces'; @Injectable() export class IChercheSearchResultFormatter { diff --git a/packages/geo/src/lib/search/shared/sources/ilayer.interfaces.ts b/packages/geo/src/lib/search/shared/sources/ilayer.interfaces.ts index de5ef352cd..21ab72e019 100644 --- a/packages/geo/src/lib/search/shared/sources/ilayer.interfaces.ts +++ b/packages/geo/src/lib/search/shared/sources/ilayer.interfaces.ts @@ -1,6 +1,6 @@ -import { QueryableDataSourceOptions } from './../../../query/shared/query.interfaces'; import { WMSDataSourceOptions } from '../../../datasource/shared/datasources/wms-datasource.interface'; import { ImageLayerOptions } from '../../../layer/shared/layers/image-layer.interface'; +import { QueryableDataSourceOptions } from './../../../query/shared/query.interfaces'; import { SearchSourceOptions } from './source.interfaces'; export interface ILayerSearchSourceOptions extends SearchSourceOptions { diff --git a/packages/geo/src/lib/search/shared/sources/ilayer.providers.ts b/packages/geo/src/lib/search/shared/sources/ilayer.providers.ts index bde1cf879e..9e5dc50f6d 100644 --- a/packages/geo/src/lib/search/shared/sources/ilayer.providers.ts +++ b/packages/geo/src/lib/search/shared/sources/ilayer.providers.ts @@ -2,8 +2,8 @@ import { HttpClient } from '@angular/common/http'; import { ConfigService, LanguageService, StorageService } from '@igo2/core'; +import { ILayerSearchResultFormatter, ILayerSearchSource } from './ilayer'; import { SearchSource } from './source'; -import { ILayerSearchSource, ILayerSearchResultFormatter } from './ilayer'; /** * ILayer search result formatter factory diff --git a/packages/geo/src/lib/search/shared/sources/ilayer.ts b/packages/geo/src/lib/search/shared/sources/ilayer.ts index 014b11f090..d74afe92a7 100644 --- a/packages/geo/src/lib/search/shared/sources/ilayer.ts +++ b/packages/geo/src/lib/search/shared/sources/ilayer.ts @@ -1,29 +1,28 @@ -import { Injectable, Inject } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; - -import { Observable, BehaviorSubject, of } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { Inject, Injectable } from '@angular/core'; import { LanguageService, StorageService } from '@igo2/core'; -import { customCacheHasher, ObjectUtils } from '@igo2/utils'; +import { ObjectUtils, customCacheHasher } from '@igo2/utils'; -import { getResolutionFromScale } from '../../../map/shared/map.utils'; -import { LAYER } from '../../../layer'; -import { QueryableDataSourceOptions, QueryFormat } from '../../../query'; -import { QueryHtmlTarget } from './../../../query/shared/query.enums'; +import { BehaviorSubject, Observable, of } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { Cacheable } from 'ts-cacheable'; +import { LAYER } from '../../../layer'; +import { getResolutionFromScale } from '../../../map/shared/map.utils'; +import { QueryFormat, QueryableDataSourceOptions } from '../../../query'; import { SearchResult, TextSearch } from '../search.interfaces'; -import { SearchSource } from './source'; -import { TextSearchOptions } from './source.interfaces'; +import { computeTermSimilarity } from '../search.utils'; +import { QueryHtmlTarget } from './../../../query/shared/query.enums'; import { - ILayerSearchSourceOptions, ILayerData, + ILayerDataSource, ILayerItemResponse, - ILayerServiceResponse, - ILayerDataSource + ILayerSearchSourceOptions, + ILayerServiceResponse } from './ilayer.interfaces'; -import { computeTermSimilarity } from '../search.utils'; -import { Cacheable } from 'ts-cacheable'; +import { SearchSource } from './source'; +import { TextSearchOptions } from './source.interfaces'; @Injectable() export class ILayerSearchResultFormatter { diff --git a/packages/geo/src/lib/search/shared/sources/nominatim.providers.ts b/packages/geo/src/lib/search/shared/sources/nominatim.providers.ts index d132cdab78..019097b2d2 100644 --- a/packages/geo/src/lib/search/shared/sources/nominatim.providers.ts +++ b/packages/geo/src/lib/search/shared/sources/nominatim.providers.ts @@ -2,8 +2,8 @@ import { HttpClient } from '@angular/common/http'; import { ConfigService, StorageService } from '@igo2/core'; -import { SearchSource } from './source'; import { NominatimSearchSource } from './nominatim'; +import { SearchSource } from './source'; /** * Nominatim search source factory diff --git a/packages/geo/src/lib/search/shared/sources/nominatim.ts b/packages/geo/src/lib/search/shared/sources/nominatim.ts index da18aac705..8cbc34d6b1 100644 --- a/packages/geo/src/lib/search/shared/sources/nominatim.ts +++ b/packages/geo/src/lib/search/shared/sources/nominatim.ts @@ -1,19 +1,19 @@ -import { Injectable, Inject } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; +import { Inject, Injectable } from '@angular/core'; + +import { StorageService } from '@igo2/core'; +import { customCacheHasher } from '@igo2/utils'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; +import { Cacheable } from 'ts-cacheable'; import { FEATURE, Feature, FeatureGeometry } from '../../../feature'; - -import { StorageService } from '@igo2/core'; import { SearchResult, TextSearch } from '../search.interfaces'; +import { computeTermSimilarity } from '../search.utils'; +import { NominatimData } from './nominatim.interfaces'; import { SearchSource } from './source'; import { SearchSourceOptions, TextSearchOptions } from './source.interfaces'; -import { NominatimData } from './nominatim.interfaces'; -import { computeTermSimilarity } from '../search.utils'; -import { Cacheable } from 'ts-cacheable'; -import { customCacheHasher } from '@igo2/utils'; /** * Nominatim search source diff --git a/packages/geo/src/lib/search/shared/sources/source.ts b/packages/geo/src/lib/search/shared/sources/source.ts index 52ba7b629c..0551ca8513 100644 --- a/packages/geo/src/lib/search/shared/sources/source.ts +++ b/packages/geo/src/lib/search/shared/sources/source.ts @@ -1,12 +1,13 @@ -import { ObjectUtils } from '@igo2/utils'; +import { Workspace } from '@igo2/common'; import { StorageService } from '@igo2/core'; +import { ObjectUtils } from '@igo2/utils'; + +import { FeatureStore } from '../../../feature'; import { ISearchSourceParams, SearchSourceOptions, SearchSourceSettings } from './source.interfaces'; -import { FeatureStore } from '../../../feature'; -import { Workspace } from '@igo2/common'; /** * Base search source class diff --git a/packages/geo/src/lib/search/shared/sources/storedqueries.providers.ts b/packages/geo/src/lib/search/shared/sources/storedqueries.providers.ts index c0ad5be9ac..ed38858b47 100644 --- a/packages/geo/src/lib/search/shared/sources/storedqueries.providers.ts +++ b/packages/geo/src/lib/search/shared/sources/storedqueries.providers.ts @@ -4,8 +4,8 @@ import { ConfigService, LanguageService, StorageService } from '@igo2/core'; import { SearchSource } from './source'; import { - StoredQueriesSearchSource, - StoredQueriesReverseSearchSource + StoredQueriesReverseSearchSource, + StoredQueriesSearchSource } from './storedqueries'; /** diff --git a/packages/geo/src/lib/search/shared/sources/storedqueries.ts b/packages/geo/src/lib/search/shared/sources/storedqueries.ts index 5236c96957..4e6123a7c8 100644 --- a/packages/geo/src/lib/search/shared/sources/storedqueries.ts +++ b/packages/geo/src/lib/search/shared/sources/storedqueries.ts @@ -1,34 +1,34 @@ -import { Injectable, Inject } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; +import { Inject, Injectable } from '@angular/core'; + +import { LanguageService, StorageService } from '@igo2/core'; +import { ObjectUtils, customCacheHasher } from '@igo2/utils'; + +import * as olformat from 'ol/format'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { Cacheable } from 'ts-cacheable'; -import { ObjectUtils, customCacheHasher } from '@igo2/utils'; import { FEATURE, Feature } from '../../../feature'; - -import { SearchResult, TextSearch, ReverseSearch } from '../search.interfaces'; +import { ReverseSearch, SearchResult, TextSearch } from '../search.interfaces'; +import { computeTermSimilarity } from '../search.utils'; import { SearchSource } from './source'; import { + ReverseSearchOptions, SearchSourceOptions, - TextSearchOptions, - ReverseSearchOptions + TextSearchOptions } from './source.interfaces'; import { StoredQueriesData, + StoredQueriesFields, StoredQueriesResponse, StoredQueriesReverseData, StoredQueriesReverseResponse, - StoredQueriesSearchSourceOptions, - StoredQueriesFields, - StoredQueriesReverseSearchSourceOptions + StoredQueriesReverseSearchSourceOptions, + StoredQueriesSearchSourceOptions } from './storedqueries.interfaces'; -import * as olformat from 'ol/format'; -import { LanguageService, StorageService } from '@igo2/core'; -import { computeTermSimilarity } from '../search.utils'; -import { Cacheable } from 'ts-cacheable'; - /** * StoredQueries search source */ diff --git a/packages/geo/src/lib/search/shared/sources/workspace.providers.ts b/packages/geo/src/lib/search/shared/sources/workspace.providers.ts index 7b12a2af5f..9f85538b75 100644 --- a/packages/geo/src/lib/search/shared/sources/workspace.providers.ts +++ b/packages/geo/src/lib/search/shared/sources/workspace.providers.ts @@ -1,4 +1,5 @@ import { ConfigService, LanguageService, StorageService } from '@igo2/core'; + import { SearchSource } from './source'; import { WorkspaceSearchSource } from './workspace'; diff --git a/packages/geo/src/lib/search/shared/sources/workspace.ts b/packages/geo/src/lib/search/shared/sources/workspace.ts index edeb7ee4d3..f61903303d 100644 --- a/packages/geo/src/lib/search/shared/sources/workspace.ts +++ b/packages/geo/src/lib/search/shared/sources/workspace.ts @@ -1,19 +1,18 @@ -import { Injectable, Inject } from '@angular/core'; - -import { Observable, of, BehaviorSubject } from 'rxjs'; +import { Inject, Injectable } from '@angular/core'; import { LanguageService, StorageService } from '@igo2/core'; -import { FEATURE, Feature } from '../../../feature'; +import pointOnFeature from '@turf/point-on-feature'; +import { SimpleDocumentSearchResultSetUnit } from 'flexsearch'; +import { BehaviorSubject, Observable, of } from 'rxjs'; +import { FEATURE, Feature } from '../../../feature'; +import { Layer } from '../../../layer/shared/layers/layer'; +import { GoogleLinks } from '../../../utils/googleLinks'; import { SearchResult, TextSearch } from '../search.interfaces'; +import { computeTermSimilarity } from '../search.utils'; import { SearchSource } from './source'; import { SearchSourceOptions, TextSearchOptions } from './source.interfaces'; -import { computeTermSimilarity } from '../search.utils'; -import { SimpleDocumentSearchResultSetUnit } from 'flexsearch'; -import { GoogleLinks } from '../../../utils/googleLinks'; -import pointOnFeature from '@turf/point-on-feature'; -import { Layer } from '../../../layer/shared/layers/layer'; import { WorkspaceData } from './workspace.interfaces'; /** diff --git a/packages/geo/src/lib/style/shared/datasource/esri-style-generator.ts b/packages/geo/src/lib/style/shared/datasource/esri-style-generator.ts index c626469e2f..770c4999b7 100644 --- a/packages/geo/src/lib/style/shared/datasource/esri-style-generator.ts +++ b/packages/geo/src/lib/style/shared/datasource/esri-style-generator.ts @@ -1,5 +1,5 @@ -import * as olstyle from 'ol/style'; import * as olproj from 'ol/proj'; +import * as olstyle from 'ol/style'; export class EsriStyleGenerator { public _converters: any; diff --git a/packages/geo/src/lib/style/shared/feature/feature-style.ts b/packages/geo/src/lib/style/shared/feature/feature-style.ts index b67662d382..01c27c1e74 100644 --- a/packages/geo/src/lib/style/shared/feature/feature-style.ts +++ b/packages/geo/src/lib/style/shared/feature/feature-style.ts @@ -1,7 +1,8 @@ -import * as olStyle from 'ol/style'; -import * as olGeom from 'ol/geom'; import olFeature from 'ol/Feature'; +import * as olGeom from 'ol/geom'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import * as olStyle from 'ol/style'; + import { StyleService } from '../../style-service/style.service'; export function featureRandomStyleFunction(): ( diff --git a/packages/geo/src/lib/style/shared/overlay/overlay-marker-style.utils.ts b/packages/geo/src/lib/style/shared/overlay/overlay-marker-style.utils.ts index 05d63d8515..88d1a25987 100644 --- a/packages/geo/src/lib/style/shared/overlay/overlay-marker-style.utils.ts +++ b/packages/geo/src/lib/style/shared/overlay/overlay-marker-style.utils.ts @@ -1,5 +1,5 @@ -import * as olstyle from 'ol/style'; import { asArray as ColorAsArray } from 'ol/color'; +import * as olstyle from 'ol/style'; /** * Create a marker style for points diff --git a/packages/geo/src/lib/style/shared/overlay/overlay-style.utils.ts b/packages/geo/src/lib/style/shared/overlay/overlay-style.utils.ts index 831b4eceff..339a0351dd 100644 --- a/packages/geo/src/lib/style/shared/overlay/overlay-style.utils.ts +++ b/packages/geo/src/lib/style/shared/overlay/overlay-style.utils.ts @@ -1,8 +1,9 @@ -import * as olstyle from 'ol/style'; import OlFeature from 'ol/Feature'; import { asArray as ColorAsArray } from 'ol/color'; -import { StyleService } from '../../../style/style-service/style.service'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import * as olstyle from 'ol/style'; + +import { StyleService } from '../../../style/style-service/style.service'; import { createOverlayMarkerStyle } from './overlay-marker-style.utils'; /** diff --git a/packages/geo/src/lib/style/shared/vector/commonVectorStyle.ts b/packages/geo/src/lib/style/shared/vector/commonVectorStyle.ts index 07ab67d2c9..e50954452b 100644 --- a/packages/geo/src/lib/style/shared/vector/commonVectorStyle.ts +++ b/packages/geo/src/lib/style/shared/vector/commonVectorStyle.ts @@ -1,13 +1,12 @@ -import type { default as OlGeometry } from 'ol/geom/Geometry'; -import * as olStyle from 'ol/style'; import olFeature from 'ol/Feature'; import { asArray as ColorAsArray } from 'ol/color'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; +import * as olStyle from 'ol/style'; import { Feature } from '../../../feature/shared/feature.interfaces'; -import { FeatureCommonVectorStyleOptions } from './vector-style.interface'; - -import { createOverlayDefaultStyle } from '../overlay/overlay-style.utils'; import { createOverlayMarkerStyle } from '../overlay/overlay-marker-style.utils'; +import { createOverlayDefaultStyle } from '../overlay/overlay-style.utils'; +import { FeatureCommonVectorStyleOptions } from './vector-style.interface'; /** * Generate a style for selected features diff --git a/packages/geo/src/lib/style/shared/vector/conversion.utils.ts b/packages/geo/src/lib/style/shared/vector/conversion.utils.ts index 974e082fc6..70c1344786 100644 --- a/packages/geo/src/lib/style/shared/vector/conversion.utils.ts +++ b/packages/geo/src/lib/style/shared/vector/conversion.utils.ts @@ -1,6 +1,6 @@ +import type { default as OlGeometry } from 'ol/geom/Geometry'; import olLayerVector from 'ol/layer/Vector'; import olSourceVector from 'ol/source/Vector'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; export function olStyleToBasicIgoStyle( layer: olLayerVector> diff --git a/packages/geo/src/lib/style/shared/vector/vector-style.interface.ts b/packages/geo/src/lib/style/shared/vector/vector-style.interface.ts index 0be542c445..71325aad2f 100644 --- a/packages/geo/src/lib/style/shared/vector/vector-style.interface.ts +++ b/packages/geo/src/lib/style/shared/vector/vector-style.interface.ts @@ -1,8 +1,9 @@ import olFeature from 'ol/Feature'; import type { default as OlGeometry } from 'ol/geom/Geometry'; -import { Feature } from '../../../feature/shared/feature.interfaces'; import olStyle from 'ol/style/Style'; +import { Feature } from '../../../feature/shared/feature.interfaces'; + export interface FeatureCommonVectorStyleOptions extends CommonVectorStyleOptions { feature: Feature | olFeature; diff --git a/packages/geo/src/lib/style/style-list/style-list.module.ts b/packages/geo/src/lib/style/style-list/style-list.module.ts index 40245a6189..ee324c22db 100644 --- a/packages/geo/src/lib/style/style-list/style-list.module.ts +++ b/packages/geo/src/lib/style/style-list/style-list.module.ts @@ -1,7 +1,8 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; + import { - provideStyleListOptions, - provideStyleListLoader + provideStyleListLoader, + provideStyleListOptions } from './style-list.provider'; @NgModule({ diff --git a/packages/geo/src/lib/style/style-list/style-list.provider.ts b/packages/geo/src/lib/style/style-list/style-list.provider.ts index 65b56577a3..3e9d874f07 100644 --- a/packages/geo/src/lib/style/style-list/style-list.provider.ts +++ b/packages/geo/src/lib/style/style-list/style-list.provider.ts @@ -1,7 +1,7 @@ import { APP_INITIALIZER, InjectionToken } from '@angular/core'; -import { StyleListService } from './style-list.service'; import { StyleListOptions } from './style-list.interface'; +import { StyleListService } from './style-list.service'; export let STYLELIST_OPTIONS = new InjectionToken( 'styleListOptions' diff --git a/packages/geo/src/lib/style/style-list/style-list.service.spec.ts b/packages/geo/src/lib/style/style-list/style-list.service.spec.ts index bca0d69222..f8981a4a87 100644 --- a/packages/geo/src/lib/style/style-list/style-list.service.spec.ts +++ b/packages/geo/src/lib/style/style-list/style-list.service.spec.ts @@ -1,5 +1,5 @@ -import { TestBed, inject } from '@angular/core/testing'; import { HttpClientModule } from '@angular/common/http'; +import { TestBed, inject } from '@angular/core/testing'; import { StyleListService } from './style-list.service'; diff --git a/packages/geo/src/lib/style/style-list/style-list.service.ts b/packages/geo/src/lib/style/style-list/style-list.service.ts index 37756181c9..2b371a8716 100644 --- a/packages/geo/src/lib/style/style-list/style-list.service.ts +++ b/packages/geo/src/lib/style/style-list/style-list.service.ts @@ -1,10 +1,11 @@ -import { Injectable } from '@angular/core'; import { HttpBackend, HttpClient } from '@angular/common/http'; -import { throwError } from 'rxjs'; -import { catchError } from 'rxjs/operators'; +import { Injectable } from '@angular/core'; import { ObjectUtils } from '@igo2/utils'; +import { throwError } from 'rxjs'; +import { catchError } from 'rxjs/operators'; + import { StyleListOptions } from './style-list.interface'; @Injectable({ diff --git a/packages/geo/src/lib/style/style-modal/drawing/style-modal-drawing.component.ts b/packages/geo/src/lib/style/style-modal/drawing/style-modal-drawing.component.ts index 99bed8271d..1b0199680e 100644 --- a/packages/geo/src/lib/style/style-modal/drawing/style-modal-drawing.component.ts +++ b/packages/geo/src/lib/style/style-modal/drawing/style-modal-drawing.component.ts @@ -1,9 +1,9 @@ import { Component, Inject, Input, OnInit } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms'; +import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { DrawStyleService } from '../../style-service/draw-style.service'; import { FontType } from '../../shared/font.enum'; +import { DrawStyleService } from '../../style-service/draw-style.service'; import { DrawingMatDialogData, StyleModalData diff --git a/packages/geo/src/lib/style/style-modal/layer-button/style-modal-layer-button.component.ts b/packages/geo/src/lib/style/style-modal/layer-button/style-modal-layer-button.component.ts index a43499e2b9..4e841ef5ad 100644 --- a/packages/geo/src/lib/style/style-modal/layer-button/style-modal-layer-button.component.ts +++ b/packages/geo/src/lib/style/style-modal/layer-button/style-modal-layer-button.component.ts @@ -1,7 +1,7 @@ -import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { VectorLayer } from '../../../layer/shared/layers/vector-layer'; +import { VectorLayer } from '../../../layer/shared/layers/vector-layer'; import { StyleModalLayerComponent } from '../layer/style-modal-layer.component'; import { LayerMatDialogData } from '../shared/style-modal.interface'; diff --git a/packages/geo/src/lib/style/style-modal/layer/style-modal-layer.component.ts b/packages/geo/src/lib/style/style-modal/layer/style-modal-layer.component.ts index e3c68b9901..af3a86775a 100644 --- a/packages/geo/src/lib/style/style-modal/layer/style-modal-layer.component.ts +++ b/packages/geo/src/lib/style/style-modal/layer/style-modal-layer.component.ts @@ -1,9 +1,10 @@ import { Component, Inject, Input, OnInit } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms'; +import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { asArray as ColorAsArray } from 'ol/color'; import olStyle from 'ol/style/Style'; + import { LayerMatDialogData, StyleModalData diff --git a/packages/geo/src/lib/style/style-service/draw-style.service.ts b/packages/geo/src/lib/style/style-service/draw-style.service.ts index 513cbf53e9..06a8ac2790 100644 --- a/packages/geo/src/lib/style/style-service/draw-style.service.ts +++ b/packages/geo/src/lib/style/style-service/draw-style.service.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; -import * as OlStyle from 'ol/style'; import OlPoint from 'ol/geom/Point'; import { ProjectionLike, transform } from 'ol/proj'; +import * as OlStyle from 'ol/style'; + import { FontType } from '../shared/font.enum'; @Injectable({ diff --git a/packages/geo/src/lib/style/style-service/style.service.ts b/packages/geo/src/lib/style/style-service/style.service.ts index 502fa8a019..3f1e2f6acb 100644 --- a/packages/geo/src/lib/style/style-service/style.service.ts +++ b/packages/geo/src/lib/style/style-service/style.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; +import OlFeature from 'ol/Feature'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import RenderFeature from 'ol/render/Feature'; import * as olStyle from 'ol/style'; -import OlFeature from 'ol/Feature'; -import { createOverlayMarkerStyle } from '../shared/overlay/overlay-marker-style.utils'; -import RenderFeature from 'ol/render/Feature'; +import { ClusterParam } from '../../layer/shared/clusterParam'; import { getResolutionFromScale } from '../../map/shared/map.utils'; +import { createOverlayMarkerStyle } from '../shared/overlay/overlay-marker-style.utils'; import { StyleByAttribute } from '../shared/vector/vector-style.interface'; -import { ClusterParam } from '../../layer/shared/clusterParam'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/style/style.module.ts b/packages/geo/src/lib/style/style.module.ts index 1579d28f2d..4680fe7ff7 100644 --- a/packages/geo/src/lib/style/style.module.ts +++ b/packages/geo/src/lib/style/style.module.ts @@ -1,21 +1,23 @@ import { CommonModule } from '@angular/common'; -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; + +import { ColorPickerFormFieldModule } from '@igo2/common'; import { IgoLanguageModule } from '@igo2/core'; + import { IgoStyleListModule } from './style-list/style-list.module'; import { StyleModalDrawingComponent } from './style-modal/drawing/style-modal-drawing.component'; -import { StyleModalLayerComponent } from './style-modal/layer/style-modal-layer.component'; import { StyleModalLayerButtonComponent } from './style-modal/layer-button/style-modal-layer-button.component'; +import { StyleModalLayerComponent } from './style-modal/layer/style-modal-layer.component'; import { DrawStyleService } from './style-service/draw-style.service'; import { StyleService } from './style-service/style.service'; -import { MatDialogModule } from '@angular/material/dialog'; -import { ColorPickerFormFieldModule } from '@igo2/common'; @NgModule({ imports: [ diff --git a/packages/geo/src/lib/toast/toast.component.ts b/packages/geo/src/lib/toast/toast.component.ts index 5f30a67611..ac8550566f 100644 --- a/packages/geo/src/lib/toast/toast.component.ts +++ b/packages/geo/src/lib/toast/toast.component.ts @@ -1,9 +1,11 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { FlexibleState, getEntityTitle } from '@igo2/common'; + import olFormatGeoJSON from 'ol/format/GeoJSON'; -import { Feature } from '../feature/shared/feature.interfaces'; + import { FeatureMotion } from '../feature/shared/feature.enums'; +import { Feature } from '../feature/shared/feature.interfaces'; import { moveToOlFeatures } from '../feature/shared/feature.utils'; import { IgoMap } from '../map/shared/map'; diff --git a/packages/geo/src/lib/toast/toast.module.ts b/packages/geo/src/lib/toast/toast.module.ts index fe4654c43e..cf59bcac20 100644 --- a/packages/geo/src/lib/toast/toast.module.ts +++ b/packages/geo/src/lib/toast/toast.module.ts @@ -1,9 +1,9 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { IgoPanelModule, IgoFlexibleModule } from '@igo2/common'; +import { IgoFlexibleModule, IgoPanelModule } from '@igo2/common'; import { IgoFeatureModule } from '../feature/feature.module'; import { ToastComponent } from './toast.component'; diff --git a/packages/geo/src/lib/utils/id-generator.ts b/packages/geo/src/lib/utils/id-generator.ts index 3962a70a7e..94b17df619 100644 --- a/packages/geo/src/lib/utils/id-generator.ts +++ b/packages/geo/src/lib/utils/id-generator.ts @@ -1,13 +1,13 @@ -import { ArcGISRestDataSourceOptions } from './../datasource/shared/datasources/arcgisrest-datasource.interface'; -import { Md5 } from 'ts-md5'; - import { uuid } from '@igo2/utils'; +import { Md5 } from 'ts-md5'; + +import { WFSDataSourceOptions } from '../datasource'; import { AnyDataSourceOptions } from '../datasource/shared/datasources/any-datasource.interface'; import { DataSourceOptions } from '../datasource/shared/datasources/datasource.interface'; import { WMSDataSourceOptions } from '../datasource/shared/datasources/wms-datasource.interface'; import { WMTSDataSourceOptions } from '../datasource/shared/datasources/wmts-datasource.interface'; -import { WFSDataSourceOptions } from '../datasource'; +import { ArcGISRestDataSourceOptions } from './../datasource/shared/datasources/arcgisrest-datasource.interface'; /** * Generate a id from it's datasource options. diff --git a/packages/geo/src/lib/utils/propertyTypeDetector/propertyTypeDetector.service.ts b/packages/geo/src/lib/utils/propertyTypeDetector/propertyTypeDetector.service.ts index 708c9ccdcb..76d0be6661 100644 --- a/packages/geo/src/lib/utils/propertyTypeDetector/propertyTypeDetector.service.ts +++ b/packages/geo/src/lib/utils/propertyTypeDetector/propertyTypeDetector.service.ts @@ -1,5 +1,7 @@ import { Injectable } from '@angular/core'; + import { RegexService } from '@igo2/core'; + import { GeoServiceDefinition } from './propertyTypeDetector.interface'; @Injectable({ diff --git a/packages/geo/src/lib/wkt/shared/wkt.service.ts b/packages/geo/src/lib/wkt/shared/wkt.service.ts index a21f80afe5..30ed0fd5c3 100644 --- a/packages/geo/src/lib/wkt/shared/wkt.service.ts +++ b/packages/geo/src/lib/wkt/shared/wkt.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import * as olproj from 'ol/proj'; import olWKT from 'ol/format/WKT'; +import * as olproj from 'ol/proj'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/wkt/wkt.module.ts b/packages/geo/src/lib/wkt/wkt.module.ts index 4825bcc7b8..48785abbfc 100644 --- a/packages/geo/src/lib/wkt/wkt.module.ts +++ b/packages/geo/src/lib/wkt/wkt.module.ts @@ -1,4 +1,4 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; @NgModule({ imports: [], diff --git a/packages/geo/src/lib/workspace/confirmation-popup/confirmation-popup.component.ts b/packages/geo/src/lib/workspace/confirmation-popup/confirmation-popup.component.ts index 256c7cfedc..59acb37e1f 100644 --- a/packages/geo/src/lib/workspace/confirmation-popup/confirmation-popup.component.ts +++ b/packages/geo/src/lib/workspace/confirmation-popup/confirmation-popup.component.ts @@ -1,6 +1,7 @@ -import { LanguageService } from '@igo2/core'; import { Component, Inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; + +import { LanguageService } from '@igo2/core'; export interface DialogData { type: string; diff --git a/packages/geo/src/lib/workspace/confirmation-popup/confirmation-popup.module.ts b/packages/geo/src/lib/workspace/confirmation-popup/confirmation-popup.module.ts index d8ecf2ab49..3fc24c8ec5 100644 --- a/packages/geo/src/lib/workspace/confirmation-popup/confirmation-popup.module.ts +++ b/packages/geo/src/lib/workspace/confirmation-popup/confirmation-popup.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; import { MatDialogModule } from '@angular/material/dialog'; diff --git a/packages/geo/src/lib/workspace/shared/edition-workspace.service.ts b/packages/geo/src/lib/workspace/shared/edition-workspace.service.ts index 6ccc72c6b1..a3e703049b 100644 --- a/packages/geo/src/lib/workspace/shared/edition-workspace.service.ts +++ b/packages/geo/src/lib/workspace/shared/edition-workspace.service.ts @@ -1,21 +1,31 @@ -import { Injectable } from '@angular/core'; import { HttpClient, HttpErrorResponse, HttpHeaders } from '@angular/common/http'; +import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; +import { AuthInterceptor } from '@igo2/auth'; import { ActionStore, EntityStoreFilterSelectionStrategy, + EntityTableButton, EntityTableColumnRenderer, - EntityTableTemplate, - EntityTableButton + EntityTableTemplate } from '@igo2/common'; import { ConfigService, MessageService, StorageService } from '@igo2/core'; -import { AuthInterceptor } from '@igo2/auth'; + +import olFeature from 'ol/Feature'; +import { FeatureLoader } from 'ol/featureloader'; +import GeoJSON from 'ol/format/GeoJSON'; +import WKT from 'ol/format/WKT'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olSourceImageWMS from 'ol/source/ImageWMS'; + +import { BehaviorSubject, Observable, throwError } from 'rxjs'; import { catchError, map, skipWhile, take } from 'rxjs/operators'; + import { RelationOptions, SourceFieldsOptionsParams, @@ -32,7 +42,6 @@ import { FeatureStoreLoadingLayerStrategy, FeatureStoreSelectionStrategy } from '../../feature'; - import { OgcFilterableDataSourceOptions } from '../../filter/shared/ogc-filter.interface'; import { ImageLayer, @@ -41,20 +50,12 @@ import { LinkedProperties, VectorLayer } from '../../layer/shared'; -import { StyleService } from '../../style/style-service/style.service'; import { GeoWorkspaceOptions } from '../../layer/shared/layers/layer.interface'; -import { MapBase, IgoMap } from '../../map/shared'; +import { IgoMap, MapBase } from '../../map/shared'; import { QueryableDataSourceOptions } from '../../query/shared/query.interfaces'; +import { StyleService } from '../../style/style-service/style.service'; import { EditionWorkspace } from './edition-workspace'; - -import WKT from 'ol/format/WKT'; -import GeoJSON from 'ol/format/GeoJSON'; -import olFeature from 'ol/Feature'; -import olSourceImageWMS from 'ol/source/ImageWMS'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; -import { BehaviorSubject, Observable, throwError } from 'rxjs'; import { createFilterInMapExtentOrResolutionStrategy } from './workspace.utils'; -import { FeatureLoader } from 'ol/featureloader'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/workspace/shared/edition-workspace.ts b/packages/geo/src/lib/workspace/shared/edition-workspace.ts index bf8a6b4e9e..2504fad0f2 100644 --- a/packages/geo/src/lib/workspace/shared/edition-workspace.ts +++ b/packages/geo/src/lib/workspace/shared/edition-workspace.ts @@ -1,24 +1,26 @@ import { MatDialog } from '@angular/material/dialog'; -import { Workspace, WorkspaceOptions, EntityRecord } from '@igo2/common'; -import { ConfigService } from '@igo2/core'; -import { BehaviorSubject, Subscription, Observable } from 'rxjs'; -import { ImageLayer, VectorLayer } from '../../layer/shared'; -import { IgoMap } from '../../map/shared'; -import { ConfirmationPopupComponent } from '../confirmation-popup/confirmation-popup.component'; -import { DrawControl } from '../../geometry'; -import { createInteractionStyle, GeometryType } from '../../draw'; -import { featureToOl } from '../../feature'; +import { EntityRecord, Workspace, WorkspaceOptions } from '@igo2/common'; +import { ConfigService } from '@igo2/core'; +import Collection from 'ol/Collection'; +import OlFeature from 'ol/Feature'; +import OlGeoJSON from 'ol/format/GeoJSON'; import type { Type } from 'ol/geom/Geometry'; import type { default as OlGeometry } from 'ol/geom/Geometry'; -import OlGeoJSON from 'ol/format/GeoJSON'; +import OlModify from 'ol/interaction/Modify'; import OlVectorSource from 'ol/source/Vector'; import * as OlStyle from 'ol/style'; -import OlModify from 'ol/interaction/Modify'; -import Collection from 'ol/Collection'; -import OlFeature from 'ol/Feature'; + +import { BehaviorSubject, Observable, Subscription } from 'rxjs'; + import { FeatureDataSource, RelationOptions } from '../../datasource/shared'; +import { GeometryType, createInteractionStyle } from '../../draw'; +import { featureToOl } from '../../feature'; +import { DrawControl } from '../../geometry'; +import { ImageLayer, VectorLayer } from '../../layer/shared'; +import { IgoMap } from '../../map/shared'; +import { ConfirmationPopupComponent } from '../confirmation-popup/confirmation-popup.component'; export interface EditionWorkspaceOptions extends WorkspaceOptions { layer: ImageLayer | VectorLayer; diff --git a/packages/geo/src/lib/workspace/shared/feature-workspace.service.ts b/packages/geo/src/lib/workspace/shared/feature-workspace.service.ts index df9be5292c..a0b970fc81 100644 --- a/packages/geo/src/lib/workspace/shared/feature-workspace.service.ts +++ b/packages/geo/src/lib/workspace/shared/feature-workspace.service.ts @@ -1,31 +1,31 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; + import { ActionStore, EntityStoreFilterSelectionStrategy } from '@igo2/common'; +import { ConfigService, StorageService } from '@igo2/core'; + +import { BehaviorSubject } from 'rxjs'; +import { CapabilitiesService, FeatureDataSource } from '../../datasource'; import { + FeatureMotion, FeatureStore, - FeatureStoreLoadingLayerStrategy, - FeatureStoreSelectionStrategy, FeatureStoreInMapExtentStrategy, - FeatureMotion, FeatureStoreInMapResolutionStrategy, + FeatureStoreLoadingLayerStrategy, FeatureStoreSearchIndexStrategy, + FeatureStoreSelectionStrategy, GeoPropertiesStrategy } from '../../feature'; import { LayerService, VectorLayer } from '../../layer/shared'; import { GeoWorkspaceOptions } from '../../layer/shared/layers/layer.interface'; import { IgoMap } from '../../map/shared'; -import { CapabilitiesService, FeatureDataSource } from '../../datasource'; import { getCommonVectorSelectedStyle } from '../../style/shared/vector/commonVectorStyle'; - +import { PropertyTypeDetectorService } from '../../utils/propertyTypeDetector/propertyTypeDetector.service'; import { FeatureWorkspace } from './feature-workspace'; -import { ConfigService, StorageService } from '@igo2/core'; - import { createFilterInMapExtentOrResolutionStrategy, createTableTemplate } from './workspace.utils'; -import { PropertyTypeDetectorService } from '../../utils/propertyTypeDetector/propertyTypeDetector.service'; @Injectable({ providedIn: 'root' diff --git a/packages/geo/src/lib/workspace/shared/feature-workspace.ts b/packages/geo/src/lib/workspace/shared/feature-workspace.ts index 6e82faf1ee..e8e85be149 100644 --- a/packages/geo/src/lib/workspace/shared/feature-workspace.ts +++ b/packages/geo/src/lib/workspace/shared/feature-workspace.ts @@ -1,4 +1,5 @@ import { Workspace, WorkspaceOptions } from '@igo2/common'; + import { BehaviorSubject } from 'rxjs'; import { VectorLayer } from '../../layer/shared'; diff --git a/packages/geo/src/lib/workspace/shared/wfs-workspace.service.ts b/packages/geo/src/lib/workspace/shared/wfs-workspace.service.ts index fca2c72a53..db352ccc5e 100644 --- a/packages/geo/src/lib/workspace/shared/wfs-workspace.service.ts +++ b/packages/geo/src/lib/workspace/shared/wfs-workspace.service.ts @@ -1,29 +1,31 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; + import { ActionStore, EntityStoreFilterSelectionStrategy } from '@igo2/common'; +import { ConfigService, StorageService } from '@igo2/core'; + +import { BehaviorSubject } from 'rxjs'; +import { CapabilitiesService, FeatureDataSource } from '../../datasource'; import { + FeatureMotion, FeatureStore, - FeatureStoreLoadingLayerStrategy, - FeatureStoreSelectionStrategy, FeatureStoreInMapExtentStrategy, - FeatureMotion, FeatureStoreInMapResolutionStrategy, + FeatureStoreLoadingLayerStrategy, + FeatureStoreSelectionStrategy, GeoPropertiesStrategy } from '../../feature'; import { LayerService, VectorLayer } from '../../layer/shared'; import { GeoWorkspaceOptions } from '../../layer/shared/layers/layer.interface'; import { IgoMap } from '../../map/shared'; -import { CapabilitiesService, FeatureDataSource } from '../../datasource'; import { getCommonVectorSelectedStyle } from '../../style/shared/vector/commonVectorStyle'; - +import { PropertyTypeDetectorService } from '../../utils/propertyTypeDetector'; import { WfsWorkspace } from './wfs-workspace'; -import { StorageService, ConfigService } from '@igo2/core'; import { createFilterInMapExtentOrResolutionStrategy, createTableTemplate } from './workspace.utils'; -import { PropertyTypeDetectorService } from '../../utils/propertyTypeDetector'; + @Injectable({ providedIn: 'root' }) diff --git a/packages/geo/src/lib/workspace/shared/wfs-workspace.ts b/packages/geo/src/lib/workspace/shared/wfs-workspace.ts index 9d528191fe..6adc6c6477 100644 --- a/packages/geo/src/lib/workspace/shared/wfs-workspace.ts +++ b/packages/geo/src/lib/workspace/shared/wfs-workspace.ts @@ -1,4 +1,5 @@ import { Workspace, WorkspaceOptions } from '@igo2/common'; + import { BehaviorSubject } from 'rxjs'; import { VectorLayer } from '../../layer/shared'; diff --git a/packages/geo/src/lib/workspace/shared/wms-workspace.service.ts b/packages/geo/src/lib/workspace/shared/wms-workspace.service.ts index 5b3fe7696e..fb80bc4b8a 100644 --- a/packages/geo/src/lib/workspace/shared/wms-workspace.service.ts +++ b/packages/geo/src/lib/workspace/shared/wms-workspace.service.ts @@ -1,6 +1,10 @@ import { Injectable } from '@angular/core'; + import { ActionStore, EntityStoreFilterSelectionStrategy } from '@igo2/common'; -import { StorageService, ConfigService } from '@igo2/core'; +import { ConfigService, StorageService } from '@igo2/core'; + +import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; + import { CapabilitiesService, WMSDataSource } from '../../datasource'; import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource'; import { WFSDataSourceOptions } from '../../datasource/shared/datasources/wfs-datasource.interface'; @@ -13,7 +17,6 @@ import { FeatureStoreSelectionStrategy, GeoPropertiesStrategy } from '../../feature'; - import { OgcFilterableDataSourceOptions } from '../../filter/shared/ogc-filter.interface'; import { ImageLayer, @@ -22,15 +25,13 @@ import { LinkedProperties, VectorLayer } from '../../layer/shared'; -import { StyleService } from '../../style/style-service/style.service'; import { GeoWorkspaceOptions } from '../../layer/shared/layers/layer.interface'; import { IgoMap } from '../../map/shared'; import { QueryableDataSourceOptions } from '../../query/shared/query.interfaces'; -import { WfsWorkspace } from './wfs-workspace'; import { getCommonVectorSelectedStyle } from '../../style/shared/vector/commonVectorStyle'; - +import { StyleService } from '../../style/style-service/style.service'; import { PropertyTypeDetectorService } from '../../utils/propertyTypeDetector/propertyTypeDetector.service'; -import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; +import { WfsWorkspace } from './wfs-workspace'; import { createFilterInMapExtentOrResolutionStrategy, createTableTemplate diff --git a/packages/geo/src/lib/workspace/shared/workspace.utils.ts b/packages/geo/src/lib/workspace/shared/workspace.utils.ts index 1a0bae4bee..cb46ba0fa7 100644 --- a/packages/geo/src/lib/workspace/shared/workspace.utils.ts +++ b/packages/geo/src/lib/workspace/shared/workspace.utils.ts @@ -1,29 +1,32 @@ -import { WfsWorkspace } from './wfs-workspace'; -import { FeatureWorkspace } from './feature-workspace'; -import { Observable } from 'rxjs'; import { - EntityStoreFilterCustomFuncStrategy, EntityRecord, - EntityTableColumnRenderer, - EntityTableButton, + EntityStoreFilterCustomFuncStrategy, EntityStoreStrategyFuncOptions, + EntityTableButton, + EntityTableColumnRenderer, EntityTableTemplate, Workspace } from '@igo2/common'; -import { map, skipWhile, take } from 'rxjs/operators'; -import { Feature } from '../../feature/shared/feature.interfaces'; -import { StorageScope } from '@igo2/core'; import { EntityTableColumn } from '@igo2/common'; +import { StorageScope } from '@igo2/core'; import { ObjectUtils } from '@igo2/utils'; -import { IgoMap } from '../../map/shared/map'; -import { generateIdFromSourceOptions } from '../../utils/id-generator'; -import { LayerService, VectorLayer } from '../../layer'; + import olFeature from 'ol/Feature'; import type { default as OlGeometry } from 'ol/geom/Geometry'; + +import { Observable } from 'rxjs'; +import { map, skipWhile, take } from 'rxjs/operators'; + import { RelationOptions, SourceFieldsOptionsParams } from '../../datasource/shared/datasources/datasource.interface'; +import { Feature } from '../../feature/shared/feature.interfaces'; +import { LayerService, VectorLayer } from '../../layer'; +import { IgoMap } from '../../map/shared/map'; +import { generateIdFromSourceOptions } from '../../utils/id-generator'; +import { FeatureWorkspace } from './feature-workspace'; +import { WfsWorkspace } from './wfs-workspace'; export function getRowsInMapExtent(layerId, storageService): boolean { return ( diff --git a/packages/geo/src/lib/workspace/widgets/ogc-filter/ogc-filter.component.ts b/packages/geo/src/lib/workspace/widgets/ogc-filter/ogc-filter.component.ts index c87b29e07d..34987f43f7 100644 --- a/packages/geo/src/lib/workspace/widgets/ogc-filter/ogc-filter.component.ts +++ b/packages/geo/src/lib/workspace/widgets/ogc-filter/ogc-filter.component.ts @@ -1,10 +1,10 @@ import { + ChangeDetectionStrategy, + ChangeDetectorRef, Component, - Input, - Output, EventEmitter, - ChangeDetectionStrategy, - ChangeDetectorRef + Input, + Output } from '@angular/core'; import { OnUpdateInputs, WidgetComponent } from '@igo2/common'; diff --git a/packages/geo/src/lib/workspace/widgets/ogc-filter/ogc-filter.module.ts b/packages/geo/src/lib/workspace/widgets/ogc-filter/ogc-filter.module.ts index dd2c0a5b6a..c17d1397fc 100644 --- a/packages/geo/src/lib/workspace/widgets/ogc-filter/ogc-filter.module.ts +++ b/packages/geo/src/lib/workspace/widgets/ogc-filter/ogc-filter.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { IgoLanguageModule } from '@igo2/core'; diff --git a/packages/geo/src/lib/workspace/workspace-selector/workspace-selector.directive.ts b/packages/geo/src/lib/workspace/workspace-selector/workspace-selector.directive.ts index 492244c565..04faa5788f 100644 --- a/packages/geo/src/lib/workspace/workspace-selector/workspace-selector.directive.ts +++ b/packages/geo/src/lib/workspace/workspace-selector/workspace-selector.directive.ts @@ -1,36 +1,35 @@ import { Directive, + EventEmitter, Input, - OnInit, OnDestroy, - Output, - EventEmitter + OnInit, + Output } from '@angular/core'; -import { Subscription } from 'rxjs'; -import { debounceTime } from 'rxjs/operators'; - import { Workspace, - WorkspaceStore, - WorkspaceSelectorComponent + WorkspaceSelectorComponent, + WorkspaceStore } from '@igo2/common'; -import { Layer, ImageLayer, VectorLayer } from '../../layer/shared'; -import { IgoMap } from '../../map/shared'; +import { Subscription } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; + import { + FeatureDataSource, WFSDataSource, - WMSDataSource, - FeatureDataSource + WMSDataSource } from '../../datasource'; +import { FeatureStoreInMapExtentStrategy } from '../../feature/shared/strategies/in-map-extent'; import { OgcFilterableDataSourceOptions } from '../../filter/shared'; - -import { WfsWorkspaceService } from '../shared/wfs-workspace.service'; -import { WmsWorkspaceService } from '../shared/wms-workspace.service'; +import { ImageLayer, Layer, VectorLayer } from '../../layer/shared'; +import { IgoMap } from '../../map/shared'; +import { QueryableDataSourceOptions } from '../../query/shared/query.interfaces'; import { EditionWorkspaceService } from '../shared/edition-workspace.service'; import { FeatureWorkspaceService } from '../shared/feature-workspace.service'; -import { FeatureStoreInMapExtentStrategy } from '../../feature/shared/strategies/in-map-extent'; -import { QueryableDataSourceOptions } from '../../query/shared/query.interfaces'; +import { WfsWorkspaceService } from '../shared/wfs-workspace.service'; +import { WmsWorkspaceService } from '../shared/wms-workspace.service'; @Directive({ selector: '[igoWorkspaceSelector]' diff --git a/packages/geo/src/lib/workspace/workspace-selector/workspace-selector.module.ts b/packages/geo/src/lib/workspace/workspace-selector/workspace-selector.module.ts index 9b5960febc..0a50af99d3 100644 --- a/packages/geo/src/lib/workspace/workspace-selector/workspace-selector.module.ts +++ b/packages/geo/src/lib/workspace/workspace-selector/workspace-selector.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { WorkspaceSelectorDirective } from './workspace-selector.directive'; diff --git a/packages/geo/src/lib/workspace/workspace-updator/workspace-updator.directive.ts b/packages/geo/src/lib/workspace/workspace-updator/workspace-updator.directive.ts index a8e83f07f8..48d632877f 100644 --- a/packages/geo/src/lib/workspace/workspace-updator/workspace-updator.directive.ts +++ b/packages/geo/src/lib/workspace/workspace-updator/workspace-updator.directive.ts @@ -1,25 +1,25 @@ -import { Directive, Input, OnInit, OnDestroy } from '@angular/core'; +import { Directive, Input, OnDestroy, OnInit } from '@angular/core'; + +import { Workspace } from '@igo2/common'; +import type { WorkspaceStore } from '@igo2/common'; import { Subscription } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; -import { Workspace } from '@igo2/common'; -import type { WorkspaceStore } from '@igo2/common'; -import { Layer, ImageLayer, VectorLayer } from '../../layer/shared'; -import { IgoMap } from '../../map/shared'; import { + FeatureDataSource, WFSDataSource, - WMSDataSource, - FeatureDataSource + WMSDataSource } from '../../datasource'; +import { FeatureStoreInMapExtentStrategy } from '../../feature/shared/strategies/in-map-extent'; import { OgcFilterableDataSourceOptions } from '../../filter/shared'; - -import { WfsWorkspaceService } from '../shared/wfs-workspace.service'; -import { WmsWorkspaceService } from '../shared/wms-workspace.service'; +import { ImageLayer, Layer, VectorLayer } from '../../layer/shared'; +import { IgoMap } from '../../map/shared'; +import { QueryableDataSourceOptions } from '../../query/shared/query.interfaces'; import { EditionWorkspaceService } from '../shared/edition-workspace.service'; import { FeatureWorkspaceService } from '../shared/feature-workspace.service'; -import { FeatureStoreInMapExtentStrategy } from '../../feature/shared/strategies/in-map-extent'; -import { QueryableDataSourceOptions } from '../../query/shared/query.interfaces'; +import { WfsWorkspaceService } from '../shared/wfs-workspace.service'; +import { WmsWorkspaceService } from '../shared/wms-workspace.service'; @Directive({ selector: '[igoWorkspaceUpdator]' diff --git a/packages/geo/src/lib/workspace/workspace-updator/workspace-updator.module.ts b/packages/geo/src/lib/workspace/workspace-updator/workspace-updator.module.ts index 2ebd805add..d185498b65 100644 --- a/packages/geo/src/lib/workspace/workspace-updator/workspace-updator.module.ts +++ b/packages/geo/src/lib/workspace/workspace-updator/workspace-updator.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { WorkspaceUpdatorDirective } from './workspace-updator.directive'; diff --git a/packages/geo/src/lib/workspace/workspace.module.ts b/packages/geo/src/lib/workspace/workspace.module.ts index aa1bee447c..5e260a7eb2 100644 --- a/packages/geo/src/lib/workspace/workspace.module.ts +++ b/packages/geo/src/lib/workspace/workspace.module.ts @@ -1,15 +1,15 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { MatDialogModule } from '@angular/material/dialog'; -import { IgoWidgetModule } from '@igo2/common'; - -import { provideOgcFilterWidget } from './widgets/widgets'; +import { IgoWidgetModule } from '@igo2/common'; import { IgoLanguageModule } from '@igo2/core'; + +import { IgoConfirmationPopupModule } from './confirmation-popup/confirmation-popup.module'; import { IgoOgcFilterModule } from './widgets/ogc-filter/ogc-filter.module'; +import { provideOgcFilterWidget } from './widgets/widgets'; import { IgoWorkspaceSelectorModule } from './workspace-selector/workspace-selector.module'; import { IgoWorkspaceUpdatorModule } from './workspace-updator/workspace-updator.module'; -import { IgoConfirmationPopupModule } from './confirmation-popup/confirmation-popup.module'; @NgModule({ imports: [ diff --git a/packages/integration/src/lib/about/about-tool/about-tool.component.spec.ts b/packages/integration/src/lib/about/about-tool/about-tool.component.spec.ts index c4e9878332..72b6335be2 100644 --- a/packages/integration/src/lib/about/about-tool/about-tool.component.spec.ts +++ b/packages/integration/src/lib/about/about-tool/about-tool.component.spec.ts @@ -1,7 +1,8 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { IgoCustomHtmlModule } from '@igo2/common'; import { IgoLanguageModule } from '@igo2/core'; + import { AboutToolComponent } from './about-tool.component'; describe('AboutToolComponent', () => { diff --git a/packages/integration/src/lib/about/about-tool/about-tool.component.ts b/packages/integration/src/lib/about/about-tool/about-tool.component.ts index 14681666a2..e671a2fbaa 100644 --- a/packages/integration/src/lib/about/about-tool/about-tool.component.ts +++ b/packages/integration/src/lib/about/about-tool/about-tool.component.ts @@ -1,11 +1,12 @@ +import { HttpClient } from '@angular/common/http'; import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; +import { AuthService } from '@igo2/auth'; import { ToolComponent } from '@igo2/common'; import { ConfigService, LanguageService, Version } from '@igo2/core'; + import { of } from 'rxjs'; import type { Observable } from 'rxjs'; -import { AuthService } from '@igo2/auth'; -import { HttpClient } from '@angular/common/http'; @ToolComponent({ name: 'about', diff --git a/packages/integration/src/lib/about/about.module.ts b/packages/integration/src/lib/about/about.module.ts index 9b3d8f5af6..7dec86504b 100644 --- a/packages/integration/src/lib/about/about.module.ts +++ b/packages/integration/src/lib/about/about.module.ts @@ -1,16 +1,16 @@ +import { CommonModule } from '@angular/common'; import { - NgModule, + CUSTOM_ELEMENTS_SCHEMA, ModuleWithProviders, - CUSTOM_ELEMENTS_SCHEMA + NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatTooltipModule } from '@angular/material/tooltip'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; +import { MatTooltipModule } from '@angular/material/tooltip'; -import { IgoLanguageModule } from '@igo2/core'; import { IgoCustomHtmlModule, IgoInteractiveTourModule } from '@igo2/common'; +import { IgoLanguageModule } from '@igo2/core'; import { AboutToolComponent } from './about-tool/about-tool.component'; diff --git a/packages/integration/src/lib/analytics/analytics-listener.service.ts b/packages/integration/src/lib/analytics/analytics-listener.service.ts index 6a90b9c49b..e1eb7b665f 100644 --- a/packages/integration/src/lib/analytics/analytics-listener.service.ts +++ b/packages/integration/src/lib/analytics/analytics-listener.service.ts @@ -1,23 +1,23 @@ import { Injectable } from '@angular/core'; -import { skip } from 'rxjs/operators'; -import { AnalyticsService } from '@igo2/core'; import { AuthService } from '@igo2/auth'; - -import { ContextState } from '../context/context.state'; -import { SearchState } from '../search/search.state'; -import { ToolState } from '../tool/tool.state'; -import { MapState } from '../map/map.state'; - +import { AnalyticsService } from '@igo2/core'; import { - Layer, - WMTSDataSourceOptions, - WMSDataSourceOptions, ArcGISRestDataSourceOptions, + ArcGISRestImageDataSourceOptions, + Layer, TileArcGISRestDataSourceOptions, - ArcGISRestImageDataSourceOptions + WMSDataSourceOptions, + WMTSDataSourceOptions } from '@igo2/geo'; +import { skip } from 'rxjs/operators'; + +import { ContextState } from '../context/context.state'; +import { MapState } from '../map/map.state'; +import { SearchState } from '../search/search.state'; +import { ToolState } from '../tool/tool.state'; + /** * Service that holds the state of the search module */ diff --git a/packages/integration/src/lib/catalog/catalog-browser-tool/catalog-browser-tool.component.ts b/packages/integration/src/lib/catalog/catalog-browser-tool/catalog-browser-tool.component.ts index aea5366fe6..30a4aaa93a 100644 --- a/packages/integration/src/lib/catalog/catalog-browser-tool/catalog-browser-tool.component.ts +++ b/packages/integration/src/lib/catalog/catalog-browser-tool/catalog-browser-tool.component.ts @@ -1,25 +1,24 @@ import { + ChangeDetectionStrategy, Component, Input, - OnInit, OnDestroy, - ChangeDetectionStrategy + OnInit } from '@angular/core'; -import { BehaviorSubject, Subscription } from 'rxjs'; -import { take } from 'rxjs/operators'; - -import { EntityRecord, EntityStore, ToolComponent } from '@igo2/common'; import { AuthService } from '@igo2/auth'; - +import { EntityRecord, EntityStore, ToolComponent } from '@igo2/common'; import { - IgoMap, Catalog, CatalogItem, CatalogItemState, - CatalogService + CatalogService, + IgoMap } from '@igo2/geo'; +import { BehaviorSubject, Subscription } from 'rxjs'; +import { take } from 'rxjs/operators'; + import { MapState } from '../../map/map.state'; import { CatalogState } from '../catalog.state'; diff --git a/packages/integration/src/lib/catalog/catalog-browser-tool/catalog-browser-tool.module.ts b/packages/integration/src/lib/catalog/catalog-browser-tool/catalog-browser-tool.module.ts index 7a78143ed4..b64f11ca0c 100644 --- a/packages/integration/src/lib/catalog/catalog-browser-tool/catalog-browser-tool.module.ts +++ b/packages/integration/src/lib/catalog/catalog-browser-tool/catalog-browser-tool.module.ts @@ -1,7 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { IgoCatalogBrowserModule } from '@igo2/geo'; + import { CatalogBrowserToolComponent } from './catalog-browser-tool.component'; /** diff --git a/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.component.ts b/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.component.ts index 2ceb8dd595..89822260fb 100644 --- a/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.component.ts +++ b/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.component.ts @@ -1,16 +1,16 @@ import { - Component, - OnInit, ChangeDetectionStrategy, - Input + Component, + Input, + OnInit } from '@angular/core'; -import { take } from 'rxjs/operators'; import { ToolComponent } from '@igo2/common'; - import { EntityStore } from '@igo2/common'; -import { Catalog, CatalogService } from '@igo2/geo'; import { StorageService } from '@igo2/core'; +import { Catalog, CatalogService } from '@igo2/geo'; + +import { take } from 'rxjs/operators'; import { ToolState } from '../../tool/tool.state'; import { CatalogState } from '../catalog.state'; diff --git a/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.module.ts b/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.module.ts index 538887f55a..d259fda8a7 100644 --- a/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.module.ts +++ b/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.module.ts @@ -1,7 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { IgoCatalogLibraryModule } from '@igo2/geo'; + import { CatalogLibraryToolComponent } from './catalog-library-tool.component'; /** diff --git a/packages/integration/src/lib/catalog/catalog.module.ts b/packages/integration/src/lib/catalog/catalog.module.ts index 5b0da32e47..b5671a17b4 100644 --- a/packages/integration/src/lib/catalog/catalog.module.ts +++ b/packages/integration/src/lib/catalog/catalog.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; -import { IgoAppCatalogLibraryToolModule } from './catalog-library-tool/catalog-library-tool.module'; import { IgoAppCatalogBrowserToolModule } from './catalog-browser-tool/catalog-browser-tool.module'; +import { IgoAppCatalogLibraryToolModule } from './catalog-library-tool/catalog-library-tool.module'; @NgModule({ imports: [], diff --git a/packages/integration/src/lib/context/context-editor-tool/context-editor-tool.component.ts b/packages/integration/src/lib/context/context-editor-tool/context-editor-tool.component.ts index a84344b9e1..cdb2fe625f 100644 --- a/packages/integration/src/lib/context/context-editor-tool/context-editor-tool.component.ts +++ b/packages/integration/src/lib/context/context-editor-tool/context-editor-tool.component.ts @@ -1,6 +1,7 @@ import { Component } from '@angular/core'; import { ToolComponent } from '@igo2/common'; + import { ToolState } from '../../tool/tool.state'; @ToolComponent({ diff --git a/packages/integration/src/lib/context/context-manager-tool/context-manager-tool.component.ts b/packages/integration/src/lib/context/context-manager-tool/context-manager-tool.component.ts index 256172523a..bf469a26b9 100644 --- a/packages/integration/src/lib/context/context-manager-tool/context-manager-tool.component.ts +++ b/packages/integration/src/lib/context/context-manager-tool/context-manager-tool.component.ts @@ -1,10 +1,10 @@ import { Component, Input } from '@angular/core'; import { ToolComponent } from '@igo2/common'; +import { IgoMap } from '@igo2/geo'; -import { ToolState } from '../../tool/tool.state'; import { MapState } from '../../map/map.state'; -import { IgoMap } from '@igo2/geo'; +import { ToolState } from '../../tool/tool.state'; @ToolComponent({ name: 'contextManager', diff --git a/packages/integration/src/lib/context/context-share-tool/context-share-tool.component.ts b/packages/integration/src/lib/context/context-share-tool/context-share-tool.component.ts index 8bfeda1be5..00f69c0ce0 100644 --- a/packages/integration/src/lib/context/context-share-tool/context-share-tool.component.ts +++ b/packages/integration/src/lib/context/context-share-tool/context-share-tool.component.ts @@ -3,8 +3,8 @@ import { Component } from '@angular/core'; import { ToolComponent } from '@igo2/common'; import { IgoMap, LayerListControlsOptions } from '@igo2/geo'; -import { MapState } from '../../map/map.state'; import { LayerListToolState } from '../../map/layer-list-tool.state'; +import { MapState } from '../../map/map.state'; @ToolComponent({ name: 'shareMap', diff --git a/packages/integration/src/lib/context/context.module.ts b/packages/integration/src/lib/context/context.module.ts index a6c0362b2c..4f9c284df2 100644 --- a/packages/integration/src/lib/context/context.module.ts +++ b/packages/integration/src/lib/context/context.module.ts @@ -1,4 +1,4 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { IgoContextModule } from '@igo2/context'; diff --git a/packages/integration/src/lib/context/context.state.ts b/packages/integration/src/lib/context/context.state.ts index c2fc372319..41f93462ca 100644 --- a/packages/integration/src/lib/context/context.state.ts +++ b/packages/integration/src/lib/context/context.state.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; - -import { LanguageService } from '@igo2/core'; import { Tool, ToolService } from '@igo2/common'; import { ContextService, DetailedContext } from '@igo2/context'; +import { LanguageService } from '@igo2/core'; + +import { BehaviorSubject } from 'rxjs'; import { ToolState } from '../tool/tool.state'; diff --git a/packages/integration/src/lib/directions/directions-tool/directions-tool.component.ts b/packages/integration/src/lib/directions/directions-tool/directions-tool.component.ts index 218b15ad58..d9bb0fe13d 100644 --- a/packages/integration/src/lib/directions/directions-tool/directions-tool.component.ts +++ b/packages/integration/src/lib/directions/directions-tool/directions-tool.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { AuthService } from '@igo2/auth'; +import { AuthService } from '@igo2/auth'; import { ToolComponent } from '@igo2/common'; import { LanguageService, @@ -11,13 +11,14 @@ import { import { IgoMap, RoutesFeatureStore, + StepFeatureStore, StopsFeatureStore, - StopsStore, - StepFeatureStore + StopsStore } from '@igo2/geo'; + import { Subject } from 'rxjs'; -import { ContextState } from '../../context/context.state'; +import { ContextState } from '../../context/context.state'; import { MapState } from '../../map/map.state'; import { DirectionState } from '../directions.state'; diff --git a/packages/integration/src/lib/directions/directions.module.ts b/packages/integration/src/lib/directions/directions.module.ts index c9e2451906..729bf0acc0 100644 --- a/packages/integration/src/lib/directions/directions.module.ts +++ b/packages/integration/src/lib/directions/directions.module.ts @@ -1,10 +1,11 @@ import { - NgModule, + CUSTOM_ELEMENTS_SCHEMA, ModuleWithProviders, - CUSTOM_ELEMENTS_SCHEMA + NgModule } from '@angular/core'; import { IgoDirectionsModule } from '@igo2/geo'; + import { DirectionsToolComponent } from './directions-tool/directions-tool.component'; @NgModule({ diff --git a/packages/integration/src/lib/directions/directions.state.ts b/packages/integration/src/lib/directions/directions.state.ts index 0c5b13ba3f..a8363893d3 100644 --- a/packages/integration/src/lib/directions/directions.state.ts +++ b/packages/integration/src/lib/directions/directions.state.ts @@ -2,12 +2,14 @@ import { Injectable } from '@angular/core'; import { AnyLayerOptions, - StopsStore, - StopsFeatureStore, RoutesFeatureStore, - StepFeatureStore + StepFeatureStore, + StopsFeatureStore, + StopsStore } from '@igo2/geo'; + import { Subject } from 'rxjs'; + import { MapState } from '../map/map.state'; /** diff --git a/packages/integration/src/lib/draw/draw.module.ts b/packages/integration/src/lib/draw/draw.module.ts index 0cb4d1e9ac..57ff8105db 100644 --- a/packages/integration/src/lib/draw/draw.module.ts +++ b/packages/integration/src/lib/draw/draw.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { IgoDrawingToolModule } from '@igo2/geo'; + import { IgoAppDrawingToolModule } from './drawing-tool/drawing-tool.module'; @NgModule({ diff --git a/packages/integration/src/lib/draw/draw.state.ts b/packages/integration/src/lib/draw/draw.state.ts index 2ee2235263..013051789a 100644 --- a/packages/integration/src/lib/draw/draw.state.ts +++ b/packages/integration/src/lib/draw/draw.state.ts @@ -6,6 +6,7 @@ import { FeatureWithDraw, VectorLayer } from '@igo2/geo'; + import { MapState } from '../map/map.state'; /** diff --git a/packages/integration/src/lib/draw/drawing-tool/drawing-tool.component.ts b/packages/integration/src/lib/draw/drawing-tool/drawing-tool.component.ts index ae3e65f184..28e7910078 100644 --- a/packages/integration/src/lib/draw/drawing-tool/drawing-tool.component.ts +++ b/packages/integration/src/lib/draw/drawing-tool/drawing-tool.component.ts @@ -1,13 +1,14 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ToolComponent } from '@igo2/common'; import { - FeatureStore, - IgoMap, DrawControl, + FeatureStore, FeatureWithDraw, + IgoMap, VectorLayer } from '@igo2/geo'; + import { MapState } from '../../map/map.state'; import { DrawState } from '../draw.state'; diff --git a/packages/integration/src/lib/draw/drawing-tool/drawing-tool.module.ts b/packages/integration/src/lib/draw/drawing-tool/drawing-tool.module.ts index a5592f5697..3c496ce928 100644 --- a/packages/integration/src/lib/draw/drawing-tool/drawing-tool.module.ts +++ b/packages/integration/src/lib/draw/drawing-tool/drawing-tool.module.ts @@ -1,4 +1,4 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { IgoDrawingToolModule } from '@igo2/geo'; diff --git a/packages/integration/src/lib/filter/active-ogc-filter-tool/active-ogc-filter-tool.animation.ts b/packages/integration/src/lib/filter/active-ogc-filter-tool/active-ogc-filter-tool.animation.ts index f38a74b20c..89fe3474ec 100644 --- a/packages/integration/src/lib/filter/active-ogc-filter-tool/active-ogc-filter-tool.animation.ts +++ b/packages/integration/src/lib/filter/active-ogc-filter-tool/active-ogc-filter-tool.animation.ts @@ -1,10 +1,10 @@ import { - trigger, + AnimationTriggerMetadata, + animate, state, style, transition, - animate, - AnimationTriggerMetadata + trigger } from '@angular/animations'; export function toolSlideInOut( diff --git a/packages/integration/src/lib/filter/active-ogc-filter-tool/active-ogc-filter-tool.component.ts b/packages/integration/src/lib/filter/active-ogc-filter-tool/active-ogc-filter-tool.component.ts index bea040da3a..fd0c973913 100644 --- a/packages/integration/src/lib/filter/active-ogc-filter-tool/active-ogc-filter-tool.component.ts +++ b/packages/integration/src/lib/filter/active-ogc-filter-tool/active-ogc-filter-tool.component.ts @@ -1,9 +1,9 @@ import { Component } from '@angular/core'; import { ToolComponent } from '@igo2/common'; -import { MapState } from '../../map/map.state'; -import { Layer, IgoMap } from '@igo2/geo'; +import { IgoMap, Layer } from '@igo2/geo'; +import { MapState } from '../../map/map.state'; import { toolSlideInOut } from './active-ogc-filter-tool.animation'; @ToolComponent({ diff --git a/packages/integration/src/lib/filter/active-time-filter-tool/active-time-filter-tool.animation.ts b/packages/integration/src/lib/filter/active-time-filter-tool/active-time-filter-tool.animation.ts index f38a74b20c..89fe3474ec 100644 --- a/packages/integration/src/lib/filter/active-time-filter-tool/active-time-filter-tool.animation.ts +++ b/packages/integration/src/lib/filter/active-time-filter-tool/active-time-filter-tool.animation.ts @@ -1,10 +1,10 @@ import { - trigger, + AnimationTriggerMetadata, + animate, state, style, transition, - animate, - AnimationTriggerMetadata + trigger } from '@angular/animations'; export function toolSlideInOut( diff --git a/packages/integration/src/lib/filter/active-time-filter-tool/active-time-filter-tool.component.ts b/packages/integration/src/lib/filter/active-time-filter-tool/active-time-filter-tool.component.ts index f054c5dd31..2e25c442ec 100644 --- a/packages/integration/src/lib/filter/active-time-filter-tool/active-time-filter-tool.component.ts +++ b/packages/integration/src/lib/filter/active-time-filter-tool/active-time-filter-tool.component.ts @@ -1,8 +1,9 @@ import { Component } from '@angular/core'; import { ToolComponent } from '@igo2/common'; -import { MapState } from '../../map/map.state'; import { IgoMap, Layer } from '@igo2/geo'; + +import { MapState } from '../../map/map.state'; import { toolSlideInOut } from './active-time-filter-tool.animation'; @ToolComponent({ diff --git a/packages/integration/src/lib/filter/filter.module.ts b/packages/integration/src/lib/filter/filter.module.ts index 6c751d009c..01b7459b3f 100644 --- a/packages/integration/src/lib/filter/filter.module.ts +++ b/packages/integration/src/lib/filter/filter.module.ts @@ -1,16 +1,17 @@ +import { CommonModule } from '@angular/common'; import { - NgModule, + CUSTOM_ELEMENTS_SCHEMA, ModuleWithProviders, - CUSTOM_ELEMENTS_SCHEMA + NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { IgoFilterModule, IgoQueryModule } from '@igo2/geo'; + +import { ActiveOgcFilterToolComponent } from './active-ogc-filter-tool/active-ogc-filter-tool.component'; +import { ActiveTimeFilterToolComponent } from './active-time-filter-tool/active-time-filter-tool.component'; import { OgcFilterToolComponent } from './ogc-filter-tool/ogc-filter-tool.component'; -import { TimeFilterToolComponent } from './time-filter-tool/time-filter-tool.component'; import { SpatialFilterToolComponent } from './spatial-filter-tool/spatial-filter-tool.component'; -import { ActiveTimeFilterToolComponent } from './active-time-filter-tool/active-time-filter-tool.component'; -import { ActiveOgcFilterToolComponent } from './active-ogc-filter-tool/active-ogc-filter-tool.component'; +import { TimeFilterToolComponent } from './time-filter-tool/time-filter-tool.component'; @NgModule({ imports: [IgoFilterModule, IgoQueryModule, CommonModule], diff --git a/packages/integration/src/lib/filter/spatial-filter-tool/spatial-filter-tool.component.ts b/packages/integration/src/lib/filter/spatial-filter-tool/spatial-filter-tool.component.ts index 12c1bb96d6..98066ca974 100644 --- a/packages/integration/src/lib/filter/spatial-filter-tool/spatial-filter-tool.component.ts +++ b/packages/integration/src/lib/filter/spatial-filter-tool/spatial-filter-tool.component.ts @@ -1,57 +1,60 @@ import { - Component, - Input, ChangeDetectionStrategy, ChangeDetectorRef, + Component, + Input, OnDestroy, OnInit } from '@angular/core'; import { MatIconRegistry } from '@angular/material/icon'; -import { Observable, forkJoin, Subject } from 'rxjs'; -import { tap, take, takeUntil } from 'rxjs/operators'; import { - IgoMap, + EntityStore, + EntityStoreWithStrategy, + ToolComponent +} from '@igo2/common'; +import { LanguageService, MessageService } from '@igo2/core'; +import { + ClusterDataSource, + DataSource, DataSourceService, - LayerService, + ExportOptions, Feature, - moveToOlFeatures, FeatureMotion, - ClusterDataSource, - featureToOl, - DataSource, + IgoMap, + Layer, + LayerService, + MeasureLengthUnit, QueryableDataSourceOptions, - SpatialFilterService, - SpatialFilterType, SpatialFilterItemType, SpatialFilterQueryType, + SpatialFilterService, SpatialFilterThematic, - Layer, + SpatialFilterType, VectorLayer, createOverlayMarkerStyle, - ExportOptions, - MeasureLengthUnit + featureToOl, + moveToOlFeatures } from '@igo2/geo'; -import { - EntityStore, - EntityStoreWithStrategy, - ToolComponent -} from '@igo2/common'; + +import { EventsKey } from 'ol/events'; import olFormatGeoJSON from 'ol/format/GeoJSON'; -import olSourceVector from 'ol/source/Vector'; -import olSourceCluster from 'ol/source/Cluster'; import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olSourceCluster from 'ol/source/Cluster'; +import olSourceVector from 'ol/source/Vector'; +import * as olstyle from 'ol/style'; + +import { Observable, Subject, forkJoin } from 'rxjs'; import { BehaviorSubject } from 'rxjs'; +import { take, takeUntil, tap } from 'rxjs/operators'; + import { MapState } from '../../map/map.state'; +import { ToolState } from '../../tool/tool.state'; +import { WorkspaceState } from '../../workspace/workspace.state'; import { ImportExportMode, ImportExportState } from './../../import-export/import-export.state'; -import * as olstyle from 'ol/style'; -import { MessageService, LanguageService } from '@igo2/core'; -import { ToolState } from '../../tool/tool.state'; -import { WorkspaceState } from '../../workspace/workspace.state'; -import { EventsKey } from 'ol/events'; /** * Tool to apply spatial filter diff --git a/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.ts b/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.ts index 94804a6307..c365ec6ac8 100644 --- a/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.ts +++ b/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.ts @@ -1,26 +1,26 @@ import { - Component, ChangeDetectionStrategy, - OnInit, - Input + Component, + Input, + OnInit } from '@angular/core'; import { ToolComponent } from '@igo2/common'; import type { WorkspaceStore } from '@igo2/common'; import { - IgoMap, ExportOptions, + IgoMap, ProjectionsLimitationsOptions } from '@igo2/geo'; +import { ContextState } from '../../context/context.state'; import { MapState } from '../../map/map.state'; +import { WorkspaceState } from '../../workspace/workspace.state'; import { ImportExportMode, ImportExportState, ImportExportType } from '../import-export.state'; -import { WorkspaceState } from '../../workspace/workspace.state'; -import { ContextState } from '../../context/context.state'; @ToolComponent({ name: 'importExport', diff --git a/packages/integration/src/lib/import-export/import-export.module.ts b/packages/integration/src/lib/import-export/import-export.module.ts index a48cc9b7db..33c85fd7f3 100644 --- a/packages/integration/src/lib/import-export/import-export.module.ts +++ b/packages/integration/src/lib/import-export/import-export.module.ts @@ -1,17 +1,17 @@ +import { CommonModule } from '@angular/common'; import { - NgModule, + CUSTOM_ELEMENTS_SCHEMA, ModuleWithProviders, - CUSTOM_ELEMENTS_SCHEMA + NgModule } from '@angular/core'; - -import { IgoImportExportModule, IgoStyleModule } from '@igo2/geo'; -import { ImportExportToolComponent } from './import-export-tool/import-export-tool.component'; -import { CommonModule } from '@angular/common'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; import { MatTabsModule } from '@angular/material/tabs'; -import { IgoLanguageModule } from '@igo2/core'; import { IgoContextImportExportModule } from '@igo2/context'; +import { IgoLanguageModule } from '@igo2/core'; +import { IgoImportExportModule, IgoStyleModule } from '@igo2/geo'; + +import { ImportExportToolComponent } from './import-export-tool/import-export-tool.component'; @NgModule({ imports: [ diff --git a/packages/integration/src/lib/import-export/import-export.state.ts b/packages/integration/src/lib/import-export/import-export.state.ts index 7df69d6aa5..41b089a570 100644 --- a/packages/integration/src/lib/import-export/import-export.state.ts +++ b/packages/integration/src/lib/import-export/import-export.state.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; import { ExportOptions } from '@igo2/geo'; +import { BehaviorSubject } from 'rxjs'; + export enum ImportExportType { layer = 'layer', context = 'context' diff --git a/packages/integration/src/lib/integration.module.ts b/packages/integration/src/lib/integration.module.ts index 3e2cf7a7ee..f185b14b9d 100644 --- a/packages/integration/src/lib/integration.module.ts +++ b/packages/integration/src/lib/integration.module.ts @@ -1,19 +1,19 @@ import { NgModule } from '@angular/core'; +import { IgoAppAboutModule } from './about/about.module'; import { IgoAppAnalyticsModule } from './analytics/analytics.module'; -import { IgoAppContextModule } from './context/context.module'; import { IgoAppCatalogModule } from './catalog/catalog.module'; +import { IgoAppContextModule } from './context/context.module'; import { IgoAppDirectionsModule } from './directions/directions.module'; import { IgoAppDrawModule } from './draw/draw.module'; -import { IgoAppWorkspaceModule } from './workspace/workspace.module'; +import { IgoAppFilterModule } from './filter/filter.module'; import { IgoAppImportExportModule } from './import-export/import-export.module'; import { IgoAppMapModule } from './map/map.module'; import { IgoAppMeasureModule } from './measure/measure.module'; import { IgoAppPrintModule } from './print/print.module'; import { IgoAppSearchModule } from './search/search.module'; -import { IgoAppFilterModule } from './filter/filter.module'; -import { IgoAppAboutModule } from './about/about.module'; import { IgoAppStorageModule } from './storage/storage.module'; +import { IgoAppWorkspaceModule } from './workspace/workspace.module'; @NgModule({ imports: [], diff --git a/packages/integration/src/lib/map/advanced-map-tool/advanced-coordinates/advanced-coordinates.component.ts b/packages/integration/src/lib/map/advanced-map-tool/advanced-coordinates/advanced-coordinates.component.ts index b8c52ee701..e711545a96 100644 --- a/packages/integration/src/lib/map/advanced-map-tool/advanced-coordinates/advanced-coordinates.component.ts +++ b/packages/integration/src/lib/map/advanced-map-tool/advanced-coordinates/advanced-coordinates.component.ts @@ -1,34 +1,39 @@ import { ChangeDetectorRef, Component, + Input, OnDestroy, - OnInit, - Input + OnInit } from '@angular/core'; import { - formatScale, - IgoMap, - InputProjections, - ProjectionsLimitationsOptions -} from '@igo2/geo'; -import { MapState } from '../../map.state'; -import { Clipboard } from '@igo2/utils'; + UntypedFormBuilder, + UntypedFormGroup, + Validators +} from '@angular/forms'; + import { - MessageService, + ConfigService, LanguageService, - StorageService, + MessageService, StorageScope, - ConfigService + StorageService } from '@igo2/core'; -import { BehaviorSubject, combineLatest, Subscription } from 'rxjs'; import { - UntypedFormBuilder, - UntypedFormGroup, - Validators -} from '@angular/forms'; -import { debounceTime } from 'rxjs/operators'; -import { zoneMtm, zoneUtm, computeProjectionsConstraints } from '@igo2/geo'; + IgoMap, + InputProjections, + ProjectionsLimitationsOptions, + formatScale +} from '@igo2/geo'; +import { computeProjectionsConstraints, zoneMtm, zoneUtm } from '@igo2/geo'; +import { Clipboard } from '@igo2/utils'; + import * as olproj from 'ol/proj'; + +import { BehaviorSubject, Subscription, combineLatest } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; + +import { MapState } from '../../map.state'; + /** * Tool to display the coordinates and a cursor of the center of the map */ diff --git a/packages/integration/src/lib/map/advanced-map-tool/advanced-map-tool.component.ts b/packages/integration/src/lib/map/advanced-map-tool/advanced-map-tool.component.ts index feac599aeb..88e8653b5f 100644 --- a/packages/integration/src/lib/map/advanced-map-tool/advanced-map-tool.component.ts +++ b/packages/integration/src/lib/map/advanced-map-tool/advanced-map-tool.component.ts @@ -1,5 +1,7 @@ import { Component } from '@angular/core'; + import { ToolComponent } from '@igo2/common'; + import { MapState } from '../map.state'; @ToolComponent({ diff --git a/packages/integration/src/lib/map/advanced-map-tool/advanced-swipe/advanced-swipe.component.ts b/packages/integration/src/lib/map/advanced-map-tool/advanced-swipe/advanced-swipe.component.ts index e2f48bf2ed..d9995e7765 100644 --- a/packages/integration/src/lib/map/advanced-map-tool/advanced-swipe/advanced-swipe.component.ts +++ b/packages/integration/src/lib/map/advanced-map-tool/advanced-swipe/advanced-swipe.component.ts @@ -1,13 +1,15 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { - UntypedFormGroup, UntypedFormBuilder, + UntypedFormGroup, Validators } from '@angular/forms'; + import { ContextService, DetailedContext } from '@igo2/context'; import { IgoMap, Layer, VectorLayer } from '@igo2/geo'; -import { MapState } from '../../map.state'; + import { ToolState } from '../../../tool/tool.state'; +import { MapState } from '../../map.state'; @Component({ selector: 'igo-advanced-swipe', diff --git a/packages/integration/src/lib/map/layer-list-tool.state.ts b/packages/integration/src/lib/map/layer-list-tool.state.ts index 6ca2fb212b..ad0bc85935 100644 --- a/packages/integration/src/lib/map/layer-list-tool.state.ts +++ b/packages/integration/src/lib/map/layer-list-tool.state.ts @@ -1,7 +1,9 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; + import { LayerListControlsOptions } from '@igo2/geo'; +import { BehaviorSubject } from 'rxjs'; + /** * Service that holds the state of layer list tool values */ diff --git a/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.ts b/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.ts index 4b123b4111..e6dd150f3f 100644 --- a/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.ts +++ b/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.ts @@ -1,24 +1,25 @@ -import { Component, Input, OnInit, ChangeDetectorRef } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; import { ToolComponent } from '@igo2/common'; import { - LayerListControlsEnum, - Layer, + ExportOptions, IgoMap, + Layer, + LayerListControlsEnum, LayerListControlsOptions, SearchSourceService, - sourceCanSearch, - ExportOptions + sourceCanSearch } from '@igo2/geo'; -import { ToolState } from './../../tool/tool.state'; -import { MapState } from './../map.state'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; + import { ImportExportMode, ImportExportState } from '../../import-export/import-export.state'; +import { ToolState } from './../../tool/tool.state'; +import { MapState } from './../map.state'; @ToolComponent({ name: 'mapDetails', diff --git a/packages/integration/src/lib/map/map-legend/map-legend-tool.component.ts b/packages/integration/src/lib/map/map-legend/map-legend-tool.component.ts index f2e812cd44..ba5eeeb376 100644 --- a/packages/integration/src/lib/map/map-legend/map-legend-tool.component.ts +++ b/packages/integration/src/lib/map/map-legend/map-legend-tool.component.ts @@ -1,28 +1,29 @@ import { + ChangeDetectorRef, Component, Input, - OnInit, OnDestroy, - ChangeDetectorRef + OnInit } from '@angular/core'; -import { - Observable, - Subscription, - BehaviorSubject, - ReplaySubject, - combineLatest -} from 'rxjs'; -import { map, debounceTime } from 'rxjs/operators'; import { ToolComponent } from '@igo2/common'; import { - Layer, IgoMap, + Layer, LayerListControlsOptions, SearchSourceService, sourceCanSearch } from '@igo2/geo'; +import { + BehaviorSubject, + Observable, + ReplaySubject, + Subscription, + combineLatest +} from 'rxjs'; +import { debounceTime, map } from 'rxjs/operators'; + import { ToolState } from './../../tool/tool.state'; import { MapState } from './../map.state'; diff --git a/packages/integration/src/lib/map/map-proximity-tool/map-proximity-tool.component.ts b/packages/integration/src/lib/map/map-proximity-tool/map-proximity-tool.component.ts index 388fd4958f..18895a9b6e 100644 --- a/packages/integration/src/lib/map/map-proximity-tool/map-proximity-tool.component.ts +++ b/packages/integration/src/lib/map/map-proximity-tool/map-proximity-tool.component.ts @@ -1,5 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatRadioChange } from '@angular/material/radio'; + import { EntityTableComponent, EntityTableTemplate, @@ -7,10 +8,13 @@ import { } from '@igo2/common'; import { LanguageService, MessageService } from '@igo2/core'; import { Feature, IgoMap } from '@igo2/geo'; -import { NumberUtils, Clipboard } from '@igo2/utils'; +import { Clipboard, NumberUtils } from '@igo2/utils'; + import { Subscription } from 'rxjs'; + import { MapProximityState } from '../map-proximity.state'; import { MapState } from '../map.state'; + @ToolComponent({ name: 'map-proximity', title: 'igo.integration.tools.closestFeature', diff --git a/packages/integration/src/lib/map/map-proximity.state.ts b/packages/integration/src/lib/map/map-proximity.state.ts index 5f32c8570d..59a30f1dbf 100644 --- a/packages/integration/src/lib/map/map-proximity.state.ts +++ b/packages/integration/src/lib/map/map-proximity.state.ts @@ -1,31 +1,33 @@ import { Injectable } from '@angular/core'; +import { StorageService } from '@igo2/core'; import { - FeatureStore, + FEATURE, Feature, + FeatureStore, IgoMap, - featureFromOl, - measureOlGeometryLength, Layer, - QueryableDataSourceOptions, - FEATURE, - roundCoordTo, + MapGeolocationState, QueryableDataSource, - MapGeolocationState + QueryableDataSourceOptions, + featureFromOl, + measureOlGeometryLength, + roundCoordTo } from '@igo2/geo'; -import { BehaviorSubject, combineLatest, interval, Subscription } from 'rxjs'; -import { debounceTime } from 'rxjs/operators'; -import { MapState } from '../map/map.state'; - -import GeoJSON from 'ol/format/GeoJSON'; import { uuid } from '@igo2/utils'; -import olLayerVector from 'ol/layer/Vector'; -import olVectorSource from 'ol/source/Vector'; +import GeoJSON from 'ol/format/GeoJSON'; import Geometry from 'ol/geom/Geometry'; import olLineString from 'ol/geom/LineString'; +import olLayerVector from 'ol/layer/Vector'; import * as olProj from 'ol/proj'; -import { StorageService } from '@igo2/core'; +import olVectorSource from 'ol/source/Vector'; + +import { BehaviorSubject, Subscription, combineLatest, interval } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; + +import { MapState } from '../map/map.state'; + /** * Service that holds the state of the direction module */ diff --git a/packages/integration/src/lib/map/map-tool/map-tool.component.ts b/packages/integration/src/lib/map/map-tool/map-tool.component.ts index 04a525f270..30f127d0f2 100644 --- a/packages/integration/src/lib/map/map-tool/map-tool.component.ts +++ b/packages/integration/src/lib/map/map-tool/map-tool.component.ts @@ -1,19 +1,20 @@ -import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { ToolComponent } from '@igo2/common'; import { - LayerListControlsEnum, - LayerListControlsOptions, - IgoMap, ExportOptions, - Layer + IgoMap, + Layer, + LayerListControlsEnum, + LayerListControlsOptions } from '@igo2/geo'; -import { MapState } from './../map.state'; + import { ImportExportMode, ImportExportState } from '../../import-export/import-export.state'; import { ToolState } from '../../tool/tool.state'; +import { MapState } from './../map.state'; /** * Tool to browse a map's layers or to choose a different map diff --git a/packages/integration/src/lib/map/map-tools/map-tools.component.ts b/packages/integration/src/lib/map/map-tools/map-tools.component.ts index b60636bdb9..eced5db068 100644 --- a/packages/integration/src/lib/map/map-tools/map-tools.component.ts +++ b/packages/integration/src/lib/map/map-tools/map-tools.component.ts @@ -1,34 +1,36 @@ import { - Component, ChangeDetectionStrategy, + Component, Input, + OnDestroy, OnInit, - ViewChild, - OnDestroy + ViewChild } from '@angular/core'; +import { MatTabChangeEvent } from '@angular/material/tabs'; import { ToolComponent } from '@igo2/common'; import { + ExportOptions, + IgoMap, + Layer, LayerListControlsEnum, LayerListControlsOptions, - IgoMap, SearchSourceService, - sourceCanSearch, - Layer, - ExportOptions, - VectorLayer + VectorLayer, + sourceCanSearch } from '@igo2/geo'; -import { LayerListToolState } from '../layer-list-tool.state'; -import { MatTabChangeEvent } from '@angular/material/tabs'; -import { ToolState } from '../../tool/tool.state'; -import { MapState } from '../map.state'; import { BehaviorSubject, Observable, Subscription, combineLatest } from 'rxjs'; -import { map, debounceTime } from 'rxjs/operators'; +import { debounceTime, map } from 'rxjs/operators'; + import { ImportExportMode, ImportExportState } from '../../import-export/import-export.state'; +import { ToolState } from '../../tool/tool.state'; +import { LayerListToolState } from '../layer-list-tool.state'; +import { MapState } from '../map.state'; + /** * Tool to browse a map's layers or to choose a different map */ diff --git a/packages/integration/src/lib/map/map.module.ts b/packages/integration/src/lib/map/map.module.ts index 791cc32948..2fa4b748c3 100644 --- a/packages/integration/src/lib/map/map.module.ts +++ b/packages/integration/src/lib/map/map.module.ts @@ -1,45 +1,47 @@ +import { CommonModule } from '@angular/common'; import { - NgModule, + CUSTOM_ELEMENTS_SCHEMA, ModuleWithProviders, - CUSTOM_ELEMENTS_SCHEMA + NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatOptionModule } from '@angular/material/core'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; import { MatListModule } from '@angular/material/list'; -import { MatTabsModule } from '@angular/material/tabs'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatMenuModule } from '@angular/material/menu'; -import { MatButtonModule } from '@angular/material/button'; +import { MatRadioModule } from '@angular/material/radio'; +import { MatSelectModule } from '@angular/material/select'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatTabsModule } from '@angular/material/tabs'; import { MatTooltipModule } from '@angular/material/tooltip'; + +import { IgoEntityTableModule, IgoSpinnerModule } from '@igo2/common'; +import { IgoContextModule } from '@igo2/context'; import { IgoLanguageModule } from '@igo2/core'; import { - IgoLayerModule, - IgoMetadataModule, IgoDownloadModule, IgoFilterModule, IgoImportExportModule, + IgoLayerModule, + IgoMetadataModule, IgoStyleModule } from '@igo2/geo'; -import { IgoContextModule } from '@igo2/context'; -import { MapDetailsToolComponent } from './map-details-tool/map-details-tool.component'; -import { MapToolComponent } from './map-tool/map-tool.component'; -import { MapToolsComponent } from './map-tools/map-tools.component'; -import { MapLegendToolComponent } from './map-legend/map-legend-tool.component'; + import { IgoAppWorkspaceModule } from '../workspace/workspace.module'; +import { AdvancedCoordinatesComponent } from './advanced-map-tool/advanced-coordinates/advanced-coordinates.component'; import { AdvancedMapToolComponent } from './advanced-map-tool/advanced-map-tool.component'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatOptionModule } from '@angular/material/core'; -import { MatDividerModule } from '@angular/material/divider'; -import { MatInputModule } from '@angular/material/input'; -import { MatSelectModule } from '@angular/material/select'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { IgoEntityTableModule, IgoSpinnerModule } from '@igo2/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AdvancedSwipeComponent } from './advanced-map-tool/advanced-swipe/advanced-swipe.component'; -import { AdvancedCoordinatesComponent } from './advanced-map-tool/advanced-coordinates/advanced-coordinates.component'; -import { MatRadioModule } from '@angular/material/radio'; +import { MapDetailsToolComponent } from './map-details-tool/map-details-tool.component'; +import { MapLegendToolComponent } from './map-legend/map-legend-tool.component'; import { MapProximityToolComponent } from './map-proximity-tool/map-proximity-tool.component'; +import { MapToolComponent } from './map-tool/map-tool.component'; +import { MapToolsComponent } from './map-tools/map-tools.component'; @NgModule({ imports: [ diff --git a/packages/integration/src/lib/map/map.state.ts b/packages/integration/src/lib/map/map.state.ts index f4bfb30657..89c453ab80 100644 --- a/packages/integration/src/lib/map/map.state.ts +++ b/packages/integration/src/lib/map/map.state.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; -import { StorageService, ConfigService } from '@igo2/core'; +import { ConfigService, StorageService } from '@igo2/core'; import { IgoMap, MapService, ProjectionService } from '@igo2/geo'; + // import { BehaviorSubject } from 'rxjs'; /** diff --git a/packages/integration/src/lib/measure/measure.state.ts b/packages/integration/src/lib/measure/measure.state.ts index 44ea55af66..bdc0bc9349 100644 --- a/packages/integration/src/lib/measure/measure.state.ts +++ b/packages/integration/src/lib/measure/measure.state.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { FeatureStore, FeatureWithMeasure } from '@igo2/geo'; + import { MapState } from '../map/map.state'; /** diff --git a/packages/integration/src/lib/measure/measurer-tool/measurer-tool.component.ts b/packages/integration/src/lib/measure/measurer-tool/measurer-tool.component.ts index 262f813b80..f3cfb32109 100644 --- a/packages/integration/src/lib/measure/measurer-tool/measurer-tool.component.ts +++ b/packages/integration/src/lib/measure/measurer-tool/measurer-tool.component.ts @@ -1,7 +1,8 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ToolComponent } from '@igo2/common'; import { FeatureStore, FeatureWithMeasure, IgoMap } from '@igo2/geo'; + import { MapState } from '../../map/map.state'; import { MeasureState } from '../measure.state'; diff --git a/packages/integration/src/lib/measure/measurer-tool/measurer-tool.module.ts b/packages/integration/src/lib/measure/measurer-tool/measurer-tool.module.ts index a0cc16a68b..6c7afa2c9f 100644 --- a/packages/integration/src/lib/measure/measurer-tool/measurer-tool.module.ts +++ b/packages/integration/src/lib/measure/measurer-tool/measurer-tool.module.ts @@ -1,4 +1,4 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { IgoMeasurerModule } from '@igo2/geo'; diff --git a/packages/integration/src/lib/print/print.module.ts b/packages/integration/src/lib/print/print.module.ts index b8f5fb9bfe..0b2d181084 100644 --- a/packages/integration/src/lib/print/print.module.ts +++ b/packages/integration/src/lib/print/print.module.ts @@ -1,10 +1,11 @@ import { - NgModule, + CUSTOM_ELEMENTS_SCHEMA, ModuleWithProviders, - CUSTOM_ELEMENTS_SCHEMA + NgModule } from '@angular/core'; import { IgoPrintModule } from '@igo2/geo'; + import { PrintToolComponent } from './print-tool/print-tool.component'; @NgModule({ diff --git a/packages/integration/src/lib/search/query.state.ts b/packages/integration/src/lib/search/query.state.ts index 06b65e8891..61909a94a9 100644 --- a/packages/integration/src/lib/search/query.state.ts +++ b/packages/integration/src/lib/search/query.state.ts @@ -9,6 +9,7 @@ import { PropertyTypeDetectorService, SearchResult } from '@igo2/geo'; + import { MapState } from '../map/map.state'; /** diff --git a/packages/integration/src/lib/search/search-bar/search-bar-binding.directive.ts b/packages/integration/src/lib/search/search-bar/search-bar-binding.directive.ts index 93006f8f7e..fdda64254b 100644 --- a/packages/integration/src/lib/search/search-bar/search-bar-binding.directive.ts +++ b/packages/integration/src/lib/search/search-bar/search-bar-binding.directive.ts @@ -1,13 +1,15 @@ import { Directive, - Self, - OnInit, + HostListener, OnDestroy, - HostListener + OnInit, + Self } from '@angular/core'; -import { Subscription } from 'rxjs'; import { SearchBarComponent } from '@igo2/geo'; + +import { Subscription } from 'rxjs'; + import { SearchState } from '../search.state'; @Directive({ diff --git a/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.ts b/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.ts index 5ddbfabfbc..a457241269 100644 --- a/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.ts +++ b/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.ts @@ -1,55 +1,54 @@ import { - Component, ChangeDetectionStrategy, - Input, - OnInit, + Component, ElementRef, - OnDestroy + Input, + OnDestroy, + OnInit } from '@angular/core'; -import { Observable, BehaviorSubject, Subscription, combineLatest } from 'rxjs'; -import { debounceTime, map } from 'rxjs/operators'; -import olFormatGeoJSON from 'ol/format/GeoJSON'; -import olFeature from 'ol/Feature'; -import olPoint from 'ol/geom/Point'; -import type { default as OlGeometry } from 'ol/geom/Geometry'; - -import pointOnFeature from '@turf/point-on-feature'; -import * as olProj from 'ol/proj'; -import { ConfigService } from '@igo2/core'; import { + EntityState, EntityStore, - ToolComponent, - FlexibleState, - getEntityTitle, FlexibleComponent, - EntityState + FlexibleState, + ToolComponent, + getEntityTitle } from '@igo2/common'; - +import { ConfigService } from '@igo2/core'; import { FEATURE, Feature, FeatureMotion, - SearchResult, + FeatureStore, IgoMap, - moveToOlFeatures, Research, - featuresAreTooDeepInView, - featureToOl, - featureFromOl, - getCommonVectorStyle, - getCommonVectorSelectedStyle, + SearchResult, computeOlFeaturesExtent, + featureFromOl, + featureToOl, featuresAreOutOfView, - roundCoordTo, - FeatureStore + featuresAreTooDeepInView, + getCommonVectorSelectedStyle, + getCommonVectorStyle, + moveToOlFeatures, + roundCoordTo } from '@igo2/geo'; -import { MapState } from '../../map/map.state'; +import olFeature from 'ol/Feature'; +import olFormatGeoJSON from 'ol/format/GeoJSON'; +import type { default as OlGeometry } from 'ol/geom/Geometry'; +import olPoint from 'ol/geom/Point'; +import * as olProj from 'ol/proj'; + +import pointOnFeature from '@turf/point-on-feature'; +import { BehaviorSubject, Observable, Subscription, combineLatest } from 'rxjs'; +import { debounceTime, map } from 'rxjs/operators'; -import { SearchState } from '../search.state'; -import { ToolState } from '../../tool/tool.state'; import { DirectionState } from '../../directions/directions.state'; +import { MapState } from '../../map/map.state'; +import { ToolState } from '../../tool/tool.state'; +import { SearchState } from '../search.state'; /** * Tool to browse the search results diff --git a/packages/integration/src/lib/search/search-results-tool/search-results-tool.module.ts b/packages/integration/src/lib/search/search-results-tool/search-results-tool.module.ts index d7e5d95176..84860f17d9 100644 --- a/packages/integration/src/lib/search/search-results-tool/search-results-tool.module.ts +++ b/packages/integration/src/lib/search/search-results-tool/search-results-tool.module.ts @@ -1,21 +1,20 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; - +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; +import { MatBadgeModule } from '@angular/material/badge'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatBadgeModule } from '@angular/material/badge'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { IgoLanguageModule } from '@igo2/core'; import { - IgoFlexibleModule, IgoCustomHtmlModule, + IgoFlexibleModule, IgoPanelModule } from '@igo2/common'; +import { IgoLanguageModule } from '@igo2/core'; import { + IgoFeatureDetailsModule, IgoFeatureModule, - IgoSearchModule, - IgoFeatureDetailsModule + IgoSearchModule } from '@igo2/geo'; import { SearchResultsToolComponent } from './search-results-tool.component'; diff --git a/packages/integration/src/lib/search/search.state.ts b/packages/integration/src/lib/search/search.state.ts index 5144b67203..5b36c914ad 100644 --- a/packages/integration/src/lib/search/search.state.ts +++ b/packages/integration/src/lib/search/search.state.ts @@ -8,17 +8,19 @@ import { } from '@igo2/common'; import { ConfigService, StorageService } from '@igo2/core'; import { - SearchResult, - SearchSourceService, - SearchSource, CommonVectorStyleOptions, - FeatureWorkspace, + Feature, FeatureStore, - Feature + FeatureWorkspace, + SearchResult, + SearchSource, + SearchSourceService } from '@igo2/geo'; + import { BehaviorSubject, Subscription } from 'rxjs'; -import { WorkspaceState } from '../workspace/workspace.state'; + import { MapState } from '../map'; +import { WorkspaceState } from '../workspace/workspace.state'; /** * Service that holds the state of the search module diff --git a/packages/integration/src/lib/tool/tool.state.ts b/packages/integration/src/lib/tool/tool.state.ts index 55460e5a83..bf1e7713c9 100644 --- a/packages/integration/src/lib/tool/tool.state.ts +++ b/packages/integration/src/lib/tool/tool.state.ts @@ -1,9 +1,10 @@ import { Injectable } from '@angular/core'; -import { Toolbox, ToolService } from '@igo2/common'; - +import { ToolService, Toolbox } from '@igo2/common'; import { ExportOptions } from '@igo2/geo'; + import { BehaviorSubject } from 'rxjs'; + import { ImportExportMode, ImportExportState diff --git a/packages/integration/src/lib/workspace/shared/edition-actions.service.ts b/packages/integration/src/lib/workspace/shared/edition-actions.service.ts index ff0f7d8c76..f2159ffedb 100644 --- a/packages/integration/src/lib/workspace/shared/edition-actions.service.ts +++ b/packages/integration/src/lib/workspace/shared/edition-actions.service.ts @@ -1,21 +1,22 @@ +import { DatePipe } from '@angular/common'; import { Inject, Injectable, OnDestroy } from '@angular/core'; import { Action, Widget } from '@igo2/common'; - -import { BehaviorSubject, Subscription } from 'rxjs'; -import { EditionWorkspace, OgcFilterWidget } from '@igo2/geo'; import { + LanguageService, + MediaService, StorageService, StorageServiceEvent, - StorageServiceEventEnum, - LanguageService, - MediaService + StorageServiceEventEnum } from '@igo2/core'; -import { StorageState } from '../../storage/storage.state'; +import { EditionWorkspace, OgcFilterWidget } from '@igo2/geo'; + +import { BehaviorSubject, Subscription } from 'rxjs'; import { skipWhile } from 'rxjs/operators'; + +import { StorageState } from '../../storage/storage.state'; import { ToolState } from '../../tool/tool.state'; import { getWorkspaceActions, handleZoomAuto } from './workspace.utils'; -import { DatePipe } from '@angular/common'; @Injectable({ providedIn: 'root' diff --git a/packages/integration/src/lib/workspace/shared/feature-actions.service.ts b/packages/integration/src/lib/workspace/shared/feature-actions.service.ts index 95c8934238..bfe22b8cd9 100644 --- a/packages/integration/src/lib/workspace/shared/feature-actions.service.ts +++ b/packages/integration/src/lib/workspace/shared/feature-actions.service.ts @@ -1,21 +1,22 @@ +import { DatePipe } from '@angular/common'; import { Injectable, OnDestroy } from '@angular/core'; import { Action } from '@igo2/common'; - -import { BehaviorSubject, Subscription } from 'rxjs'; -import { FeatureWorkspace } from '@igo2/geo'; import { + LanguageService, + MediaService, StorageService, StorageServiceEvent, - StorageServiceEventEnum, - LanguageService, - MediaService + StorageServiceEventEnum } from '@igo2/core'; -import { StorageState } from '../../storage/storage.state'; +import { FeatureWorkspace } from '@igo2/geo'; + +import { BehaviorSubject, Subscription } from 'rxjs'; import { skipWhile } from 'rxjs/operators'; + +import { StorageState } from '../../storage/storage.state'; import { ToolState } from '../../tool/tool.state'; import { getWorkspaceActions, handleZoomAuto } from './workspace.utils'; -import { DatePipe } from '@angular/common'; @Injectable({ providedIn: 'root' diff --git a/packages/integration/src/lib/workspace/shared/wfs-actions.service.ts b/packages/integration/src/lib/workspace/shared/wfs-actions.service.ts index 014a9d98e9..a68d548529 100644 --- a/packages/integration/src/lib/workspace/shared/wfs-actions.service.ts +++ b/packages/integration/src/lib/workspace/shared/wfs-actions.service.ts @@ -1,21 +1,22 @@ +import { DatePipe } from '@angular/common'; import { Inject, Injectable, OnDestroy } from '@angular/core'; import { Action, Widget } from '@igo2/common'; - -import { BehaviorSubject, Subscription } from 'rxjs'; -import { WfsWorkspace, OgcFilterWidget } from '@igo2/geo'; import { + LanguageService, + MediaService, StorageService, StorageServiceEvent, - StorageServiceEventEnum, - LanguageService, - MediaService + StorageServiceEventEnum } from '@igo2/core'; -import { StorageState } from '../../storage/storage.state'; +import { OgcFilterWidget, WfsWorkspace } from '@igo2/geo'; + +import { BehaviorSubject, Subscription } from 'rxjs'; import { skipWhile } from 'rxjs/operators'; + +import { StorageState } from '../../storage/storage.state'; import { ToolState } from '../../tool/tool.state'; import { getWorkspaceActions, handleZoomAuto } from './workspace.utils'; -import { DatePipe } from '@angular/common'; @Injectable({ providedIn: 'root' diff --git a/packages/integration/src/lib/workspace/shared/workspace.utils.ts b/packages/integration/src/lib/workspace/shared/workspace.utils.ts index 57b0ec2d3a..0f04f0560c 100644 --- a/packages/integration/src/lib/workspace/shared/workspace.utils.ts +++ b/packages/integration/src/lib/workspace/shared/workspace.utils.ts @@ -1,27 +1,29 @@ +import { DatePipe } from '@angular/common'; + import { + Action, EntityStoreFilterCustomFuncStrategy, EntityStoreFilterSelectionStrategy, - Widget, - Action + Widget } from '@igo2/common'; import { LanguageService, MediaService, StorageService } from '@igo2/core'; import { + EditionWorkspace, + ExportOptions, FeatureMotion, FeatureStoreSelectionStrategy, FeatureWorkspace, + OgcFilterableDataSource, WfsWorkspace, - EditionWorkspace, mapExtentStrategyActiveToolTip, - noElementSelected, - ExportOptions, - OgcFilterableDataSource + noElementSelected } from '@igo2/geo'; -import { BehaviorSubject, map } from 'rxjs'; import * as jsPDF from 'jspdf'; import 'jspdf-autotable'; +import { BehaviorSubject, map } from 'rxjs'; + import { ToolState } from '../../tool'; -import { DatePipe } from '@angular/common'; export function handleZoomAuto( workspace: FeatureWorkspace | WfsWorkspace | EditionWorkspace, diff --git a/packages/integration/src/lib/workspace/workspace-button/workspace-button.component.ts b/packages/integration/src/lib/workspace/workspace-button/workspace-button.component.ts index 4c886d2743..0406c81aff 100644 --- a/packages/integration/src/lib/workspace/workspace-button/workspace-button.component.ts +++ b/packages/integration/src/lib/workspace/workspace-button/workspace-button.component.ts @@ -1,13 +1,16 @@ import { + ChangeDetectionStrategy, Component, Input, - ChangeDetectionStrategy, - OnInit, - OnDestroy + OnDestroy, + OnInit } from '@angular/core'; + import type { Layer } from '@igo2/geo'; + +import { BehaviorSubject, Subscription, combineLatest } from 'rxjs'; + import { WorkspaceState } from '../workspace.state'; -import { BehaviorSubject, combineLatest, Subscription } from 'rxjs'; @Component({ selector: 'igo-workspace-button', diff --git a/packages/integration/src/lib/workspace/workspace.module.ts b/packages/integration/src/lib/workspace/workspace.module.ts index 0e332e3fe8..89b8ff2af6 100644 --- a/packages/integration/src/lib/workspace/workspace.module.ts +++ b/packages/integration/src/lib/workspace/workspace.module.ts @@ -1,10 +1,12 @@ +import { CommonModule, DatePipe } from '@angular/common'; import { NgModule } from '@angular/core'; -import { WorkspaceButtonComponent } from './workspace-button/workspace-button.component'; import { MatButtonModule } from '@angular/material/button'; -import { MatTooltipModule } from '@angular/material/tooltip'; import { MatIconModule } from '@angular/material/icon'; +import { MatTooltipModule } from '@angular/material/tooltip'; + import { IgoLanguageModule } from '@igo2/core'; -import { CommonModule, DatePipe } from '@angular/common'; + +import { WorkspaceButtonComponent } from './workspace-button/workspace-button.component'; @NgModule({ imports: [ diff --git a/packages/integration/src/lib/workspace/workspace.state.ts b/packages/integration/src/lib/workspace/workspace.state.ts index 2c1e035a09..a8986900e2 100644 --- a/packages/integration/src/lib/workspace/workspace.state.ts +++ b/packages/integration/src/lib/workspace/workspace.state.ts @@ -1,21 +1,22 @@ import { Injectable, OnDestroy } from '@angular/core'; -import { BehaviorSubject, Subscription, Observable, of } from 'rxjs'; - import { EntityRecord, - Workspace, - WorkspaceStore, - Widget, + EntityState, EntityStoreFilterCustomFuncStrategy, EntityStoreFilterSelectionStrategy, - EntityState + Widget, + Workspace, + WorkspaceStore } from '@igo2/common'; -import { WfsWorkspace, FeatureWorkspace, EditionWorkspace } from '@igo2/geo'; -import { FeatureActionsService } from './shared/feature-actions.service'; -import { WfsActionsService } from './shared/wfs-actions.service'; import { StorageService } from '@igo2/core'; +import { EditionWorkspace, FeatureWorkspace, WfsWorkspace } from '@igo2/geo'; + +import { BehaviorSubject, Observable, Subscription, of } from 'rxjs'; + import { EditionActionsService } from './shared/edition-actions.service'; +import { FeatureActionsService } from './shared/feature-actions.service'; +import { WfsActionsService } from './shared/wfs-actions.service'; /** * Service that holds the state of the workspace module diff --git a/packages/utils/src/lib/change.ts b/packages/utils/src/lib/change.ts index 21a02d8843..4465288a71 100644 --- a/packages/utils/src/lib/change.ts +++ b/packages/utils/src/lib/change.ts @@ -1,5 +1,5 @@ +import { ChangeType, GroupingChanges } from './change.interface'; import { StringUtils } from './string-utils'; -import { GroupingChanges, ChangeType } from './change.interface'; export class ChangeUtils { static findChanges( diff --git a/scripts/src/locale-merge.ts b/scripts/src/locale-merge.ts index e1a7f9676d..325635eea1 100644 --- a/scripts/src/locale-merge.ts +++ b/scripts/src/locale-merge.ts @@ -1,6 +1,7 @@ import { readdir } from 'fs/promises'; import { merge } from 'lodash'; import { join } from 'path'; + import { createFile, pathExist, diff --git a/scripts/src/postbuild-common.ts b/scripts/src/postbuild-common.ts index 37b47a1118..5edec96219 100644 --- a/scripts/src/postbuild-common.ts +++ b/scripts/src/postbuild-common.ts @@ -1,4 +1,5 @@ import path from 'path'; + import { compileStyle } from './utils/style.utils'; const distPath = 'dist/common'; diff --git a/scripts/src/postbuild-core.ts b/scripts/src/postbuild-core.ts index 3a60552733..129d0f7270 100644 --- a/scripts/src/postbuild-core.ts +++ b/scripts/src/postbuild-core.ts @@ -1,9 +1,10 @@ import { renameSync } from 'fs'; +import { readdir } from 'fs/promises'; import path from 'path'; +import { performance } from 'perf_hooks'; + import { copyFile, pathExist } from './utils/file-system.utils'; import { compileStyle } from './utils/style.utils'; -import { readdir } from 'fs/promises'; -import { performance } from 'perf_hooks'; const distPath = 'dist/core'; const packagesPath = 'packages/core'; diff --git a/scripts/src/postbuild-geo.ts b/scripts/src/postbuild-geo.ts index 7eee79f76e..2c068e2ae1 100644 --- a/scripts/src/postbuild-geo.ts +++ b/scripts/src/postbuild-geo.ts @@ -1,4 +1,5 @@ import path from 'path'; + import { compileStyle } from './utils/style.utils'; const distPath = 'dist/geo'; diff --git a/scripts/src/utils/style.utils.ts b/scripts/src/utils/style.utils.ts index d1e54571e7..2eff51124e 100644 --- a/scripts/src/utils/style.utils.ts +++ b/scripts/src/utils/style.utils.ts @@ -1,4 +1,5 @@ import { compile } from 'sass'; + import { createFile } from './file-system.utils'; export async function compileStyle( From dcdfdb4f84e150ce580b58ac79784c0220baf5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-=C3=89tienne=20Lord?= Date: Mon, 2 Oct 2023 11:08:11 -0400 Subject: [PATCH 4/4] chore(eslint): removed trivago plugin from eslint --- .eslintrc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.json b/.eslintrc.json index 7ccafded77..75c471607f 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -4,7 +4,7 @@ "overrides": [ { "files": ["*.ts"], - "plugins": ["unused-imports","@trivago/prettier-plugin-sort-imports"], + "plugins": ["unused-imports"], "extends": [ "plugin:@angular-eslint/recommended", "plugin:@angular-eslint/template/process-inline-templates"