Compare commits
No commits in common. "develop" and "2023.10" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -51,5 +51,4 @@ projects/common-map/node_modules/
|
|||||||
.angular/*
|
.angular/*
|
||||||
projects/common-map3d/node_modules/
|
projects/common-map3d/node_modules/
|
||||||
projects/common-map/node_modules/
|
projects/common-map/node_modules/
|
||||||
projects/ng-openlayers/node_modules/
|
|
||||||
projects/common/node_modules/
|
projects/common/node_modules/
|
||||||
|
|||||||
46
Jenkinsfile
vendored
46
Jenkinsfile
vendored
@ -1,24 +1,24 @@
|
|||||||
@Library('farmmaps-shared-library') _
|
@Library('farmmaps-shared-library') _
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent any;
|
agent any;
|
||||||
options {
|
options {
|
||||||
copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
|
copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
|
||||||
disableConcurrentBuilds();
|
disableConcurrentBuilds abortPrevious: true;
|
||||||
}
|
}
|
||||||
stages {
|
stages {
|
||||||
stage('FarmmapsLibBuildAll') {
|
stage('FarmmapsLibBuildAll') {
|
||||||
steps {
|
steps {
|
||||||
stepFarmmapsLibBuildAll();
|
stepFarmmapsLibBuildAll();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
post {
|
post {
|
||||||
success {
|
success {
|
||||||
postSuccess();
|
postSuccess();
|
||||||
}
|
}
|
||||||
always {
|
always {
|
||||||
postAlways();
|
postAlways();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,24 +1,24 @@
|
|||||||
@Library('farmmaps-shared-library') _
|
@Library('farmmaps-shared-library') _
|
||||||
|
|
||||||
pipeline {
|
pipeline {
|
||||||
agent any;
|
agent any;
|
||||||
options {
|
options {
|
||||||
copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
|
copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
|
||||||
disableConcurrentBuilds();
|
disableConcurrentBuilds abortPrevious: true;
|
||||||
}
|
}
|
||||||
stages {
|
stages {
|
||||||
stage('FarmmapsLibBuildAll') {
|
stage('FarmmapsLibBuildAll') {
|
||||||
steps {
|
steps {
|
||||||
stepFarmmapsLibBuildAll();
|
stepFarmmapsLibBuildAll();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
post {
|
post {
|
||||||
success {
|
success {
|
||||||
postSuccess();
|
postSuccess();
|
||||||
}
|
}
|
||||||
always {
|
always {
|
||||||
postAlways();
|
postAlways();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
127
README.md
127
README.md
@ -1,64 +1,65 @@
|
|||||||
# Farmmaps viewer
|
# Farmmaps viewer
|
||||||
|
|
||||||
This is a sample FarmMaps client in Angular 7.x.
|
This is a sample FarmMaps client in Angular 7.x.
|
||||||
|
|
||||||
## Quick start
|
|
||||||
|
## Quick start
|
||||||
Use one of the two options below to get started.
|
|
||||||
|
Use one of the two options below to get started.
|
||||||
## Option 1, Using docker
|
|
||||||
|
## Option 1, Using docker
|
||||||
*Dependencies*
|
|
||||||
|
*Dependencies*
|
||||||
* docker desktop
|
|
||||||
|
* docker desktop
|
||||||
*Setup*
|
|
||||||
|
*Setup*
|
||||||
```
|
|
||||||
docker pull node:12.13.1
|
```
|
||||||
docker run -t -i --entrypoint /bin/bash -p 4200:4200 node:12.13.1
|
docker pull node:12.13.1
|
||||||
```
|
docker run -t -i --entrypoint /bin/bash -p 4200:4200 node:12.13.1
|
||||||
|
```
|
||||||
Inside the running container
|
|
||||||
```
|
Inside the running container
|
||||||
git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
|
```
|
||||||
cd FarmMapsLib
|
git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
|
||||||
npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
|
cd FarmMapsLib
|
||||||
npm install -g @angular/cli
|
npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
|
||||||
npm install
|
npm install -g @angular/cli
|
||||||
ng serve --host 0.0.0.0
|
npm install
|
||||||
```
|
ng serve --host 0.0.0.0
|
||||||
*Go*
|
```
|
||||||
|
*Go*
|
||||||
Point your browser to http://localhost:4200
|
|
||||||
|
Point your browser to http://localhost:4200
|
||||||
## Option 2, Using local machine
|
|
||||||
|
## Option 2, Using local machine
|
||||||
*Dependencies*
|
|
||||||
|
*Dependencies*
|
||||||
* npm 6.9.0
|
|
||||||
* nodejs 10.16.0
|
* npm 6.9.0
|
||||||
* git
|
* nodejs 10.16.0
|
||||||
|
* git
|
||||||
*Setup*
|
|
||||||
|
*Setup*
|
||||||
```
|
|
||||||
git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
|
```
|
||||||
cd FarmMapsLib
|
git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
|
||||||
npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
|
cd FarmMapsLib
|
||||||
npm install -g @angular/cli
|
npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
|
||||||
npm install
|
npm install -g @angular/cli
|
||||||
ng serve
|
npm install
|
||||||
```
|
ng serve
|
||||||
*Go*`
|
```
|
||||||
|
*Go*
|
||||||
Point your browser to http://localhost:4200
|
|
||||||
|
Point your browser to http://localhost:4200
|
||||||
*ESLint*
|
|
||||||
|
*ESLint*
|
||||||
```
|
|
||||||
npm run lint src
|
```
|
||||||
npm run lint projects/common/src
|
npm run lint src
|
||||||
npm run lint projects/common-map/src
|
npm run lint projects/common/src
|
||||||
npm run lint projects/common-map3d/src
|
npm run lint projects/common-map/src
|
||||||
|
npm run lint projects/common-map3d/src
|
||||||
```
|
```
|
||||||
49
angular.json
49
angular.json
@ -209,13 +209,13 @@
|
|||||||
"options": {
|
"options": {
|
||||||
"tsConfig": "projects/common-map/tsconfig.lib.json",
|
"tsConfig": "projects/common-map/tsconfig.lib.json",
|
||||||
"project": "projects/common-map/ng-package.json"
|
"project": "projects/common-map/ng-package.json"
|
||||||
},
|
|
||||||
"configurations": {
|
|
||||||
"production": {
|
|
||||||
"tsConfig": "projects/common-map/tsconfig.lib.prod.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
, "configurations": {
|
||||||
|
"production": {
|
||||||
|
"tsConfig": "projects/common-map/tsconfig.lib.prod.json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"test": {
|
"test": {
|
||||||
"builder": "@angular-devkit/build-angular:karma",
|
"builder": "@angular-devkit/build-angular:karma",
|
||||||
"options": {
|
"options": {
|
||||||
@ -253,43 +253,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"ng-openlayers": {
|
|
||||||
"projectType": "library",
|
|
||||||
"root": "projects/ng-openlayers",
|
|
||||||
"sourceRoot": "projects/ng-openlayers/src",
|
|
||||||
"prefix": "ng-openlayers",
|
|
||||||
"architect": {
|
|
||||||
"build": {
|
|
||||||
"builder": "@angular-devkit/build-angular:ng-packagr",
|
|
||||||
"options": {
|
|
||||||
"tsConfig": "projects/ng-openlayers/tsconfig.lib.json",
|
|
||||||
"project": "projects/ng-openlayers/ng-package.json"
|
|
||||||
},
|
|
||||||
"configurations": {
|
|
||||||
"production": {
|
|
||||||
"tsConfig": "projects/ng-openlayers/tsconfig.lib.prod.json"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"test": {
|
|
||||||
"builder": "@angular-devkit/build-angular:karma",
|
|
||||||
"options": {
|
|
||||||
"main": "projects/ng-openlayers/src/test.ts",
|
|
||||||
"tsConfig": "projects/ng-openlayers/tsconfig.spec.json",
|
|
||||||
"karmaConfig": "projects/ng-openlayers/karma.conf.js"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"lint": {
|
|
||||||
"builder": "@angular-eslint/builder:lint",
|
|
||||||
"options": {
|
|
||||||
"lintFilePatterns": [
|
|
||||||
"projects/ng-openlayers/**/*.ts",
|
|
||||||
"projects/ng-openlayers/**/*.html"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"cli": {
|
"cli": {
|
||||||
|
|||||||
27335
package-lock.json
generated
27335
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
88
package.json
88
package.json
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "farmmaps-lib-app",
|
"name": "farmmaps-lib-app",
|
||||||
"version": "4.14.0",
|
"version": "3.5.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve",
|
"start": "ng serve",
|
||||||
"build": "ng build",
|
"build": "ng build",
|
||||||
@ -10,41 +10,41 @@
|
|||||||
"e2e": "ng e2e"
|
"e2e": "ng e2e"
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular-eslint/eslint-plugin": "^18.2.0",
|
"@angular/animations": "^14.1.3",
|
||||||
"@angular/animations": "18.2.3",
|
"@angular/common": "^14.1.3",
|
||||||
"@angular/common": "18.2.3",
|
"@angular/compiler": "^14.1.3",
|
||||||
"@angular/compiler": "18.2.3",
|
"@angular/core": "^14.1.3",
|
||||||
"@angular/core": "18.2.3",
|
"@angular-eslint/eslint-plugin": "^15.2.1",
|
||||||
"@angular/forms": "18.2.3",
|
"@angular/forms": "^14.1.3",
|
||||||
"@angular/platform-browser": "18.2.3",
|
"@angular/platform-browser": "^14.1.3",
|
||||||
"@angular/platform-browser-dynamic": "18.2.3",
|
"@angular/platform-browser-dynamic": "^14.1.3",
|
||||||
"@angular/router": "18.2.3",
|
"@angular/router": "^14.1.3",
|
||||||
"@farmmaps/common": "file:dist/common",
|
"@farmmaps/common": "file:dist/common",
|
||||||
"@farmmaps/common-map": "file:dist/common-map",
|
"@farmmaps/common-map": "file:dist/common-map",
|
||||||
"@farmmaps/common-map3d": "file:dist/common-map3d",
|
"@farmmaps/common-map3d": "file:dist/common-map3d",
|
||||||
"@farmmaps/ng-openlayers": "file:dist/ng-openlayers",
|
|
||||||
"@microsoft/signalr": "^3.1.16",
|
"@microsoft/signalr": "^3.1.16",
|
||||||
"@ng-bootstrap/ng-bootstrap": "^17.0.1",
|
"@ng-bootstrap/ng-bootstrap": "^13.0.0",
|
||||||
"@ngrx/effects": "^18.0.2",
|
"@ngrx/effects": "^14",
|
||||||
"@ngrx/router-store": "^18.0.2",
|
"@ngrx/router-store": "^14",
|
||||||
"@ngrx/store": "^18.0.2",
|
"@ngrx/store": "^14",
|
||||||
"@popperjs/core": "^2.11.8",
|
"@popperjs/core": "^2.11.6",
|
||||||
"angular-oauth2-oidc": "^17.0.2",
|
"angular-oauth2-oidc": "^13",
|
||||||
"assert": "^2.0.0",
|
"assert": "^2.0.0",
|
||||||
"bootstrap": "^5.3.3",
|
"bootstrap": "^5.2.0",
|
||||||
"browserify-zlib": "^0.2.0",
|
"browserify-zlib": "^0.2.0",
|
||||||
"buffer": "^6.0.3",
|
"buffer": "^6.0.3",
|
||||||
"cesium": "^1.97.0",
|
"cesium": "^1.97.0",
|
||||||
"core-js": "^2.6.12",
|
"core-js": "^2.6.12",
|
||||||
"https-browserify": "^1.0.0",
|
"https-browserify": "^1.0.0",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.29.4",
|
||||||
"ngrx-store-localstorage": "^18.0.0",
|
"ngrx-store-localstorage": "^14",
|
||||||
"ngx-avatars": "^1.8.0",
|
"ngx-avatar": "^4.1.0",
|
||||||
"ngx-clipboard": "^16.0.0",
|
"ngx-clipboard": "^14.0.1",
|
||||||
"ngx-image-cropper": "^7.0.0",
|
"ngx-image-cropper": "^3.3.5",
|
||||||
"ngx-uploadx": "^6.2.0",
|
"ngx-openlayers": "1.0.0-next.19",
|
||||||
"ol": "^8.2.0",
|
"ngx-uploadx": "^5.2.0",
|
||||||
|
"ol": "6.14.1",
|
||||||
"olcs": "^2.13.1",
|
"olcs": "^2.13.1",
|
||||||
"resumablejs": "^1.1.0",
|
"resumablejs": "^1.1.0",
|
||||||
"rxjs": "^7.8.1",
|
"rxjs": "^7.8.1",
|
||||||
@ -54,27 +54,23 @@
|
|||||||
"tslib": "^2.4.0",
|
"tslib": "^2.4.0",
|
||||||
"url": "^0.11.0",
|
"url": "^0.11.0",
|
||||||
"util": "^0.12.4",
|
"util": "^0.12.4",
|
||||||
"zone.js": "~0.14.10"
|
"zone.js": "~0.11.4"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"devDependencies": {
|
||||||
"@lmdb/lmdb-linux-x64": "^3.1.0",
|
"@angular-builders/custom-webpack": "^14",
|
||||||
"@rollup/rollup-linux-x64-gnu": "^4.21.2"
|
"@angular-devkit/build-angular": "^14.1.3",
|
||||||
},
|
"@angular/cli": "^14.1.3",
|
||||||
"devDependencies": {
|
"@angular/compiler-cli": "^14.1.3",
|
||||||
"@angular-builders/custom-webpack": "^18.0.0",
|
"@angular/language-service": "^14.1.3",
|
||||||
"@angular-devkit/build-angular": "18.2.3",
|
"@angular/localize": "^14.1.3",
|
||||||
"@angular/cli": "18.2.3",
|
|
||||||
"@angular/compiler-cli": "18.2.3",
|
|
||||||
"@angular/language-service": "18.2.3",
|
|
||||||
"@angular/localize": "18.2.3",
|
|
||||||
"@types/arcgis-rest-api": "^10.4.5",
|
"@types/arcgis-rest-api": "^10.4.5",
|
||||||
"@types/jasmine": "~2.8.8",
|
"@types/jasmine": "~2.8.8",
|
||||||
"@types/jasminewd2": "^2.0.9",
|
"@types/jasminewd2": "^2.0.9",
|
||||||
"@types/node": "^22.5.4",
|
"@types/node": "^12.20.15",
|
||||||
"@typescript-eslint/eslint-plugin": "^6.18.0",
|
"@typescript-eslint/eslint-plugin": "^5.54.0",
|
||||||
"@typescript-eslint/eslint-plugin-tslint": "^6.18.0",
|
"@typescript-eslint/eslint-plugin-tslint": "^5.54.0",
|
||||||
"@typescript-eslint/parser": "^6.18.0",
|
"@typescript-eslint/parser": "^5.54.0",
|
||||||
"codelyzer": "^6.0.2",
|
"codelyzer": "^0.0.28",
|
||||||
"eslint": "^8.35.0",
|
"eslint": "^8.35.0",
|
||||||
"eslint-config-prettier": "^8.6.0",
|
"eslint-config-prettier": "^8.6.0",
|
||||||
"eslint-plugin-import": "^2.27.5",
|
"eslint-plugin-import": "^2.27.5",
|
||||||
@ -85,9 +81,9 @@
|
|||||||
"karma-coverage-istanbul-reporter": "^3.0.3",
|
"karma-coverage-istanbul-reporter": "^3.0.3",
|
||||||
"karma-jasmine": "^5.1.0",
|
"karma-jasmine": "^5.1.0",
|
||||||
"karma-jasmine-html-reporter": "^2.0.0",
|
"karma-jasmine-html-reporter": "^2.0.0",
|
||||||
"ng-packagr": "^18.2.1",
|
"ng-packagr": "^14.1.0",
|
||||||
"protractor": "~7.0.0",
|
"protractor": "~7.0.0",
|
||||||
"ts-node": "^8.8.1",
|
"ts-node": "^8.8.1",
|
||||||
"typescript": "~5.4.4"
|
"typescript": "~4.6.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
209
projects/common-map/package-lock.json
generated
209
projects/common-map/package-lock.json
generated
@ -11,207 +11,20 @@
|
|||||||
"tslib": "^2.0.0"
|
"tslib": "^2.0.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@angular/core": "^18.2.3",
|
"@angular/core": ">=14.0.0",
|
||||||
"@ngrx/effects": "^18.0.2",
|
"@ngrx/effects": ">=14.0.0",
|
||||||
"@ngrx/router-store": "^18.0.2",
|
"@ngrx/router-store": ">=14.0.0",
|
||||||
"@ngrx/store": "^18.0.2",
|
"@ngrx/store": ">=14.0.0",
|
||||||
"ngrx-store-localstorage": "^18",
|
"ngrx-store-localstorage": ">=14.0.0",
|
||||||
"tassign": "^1.0.0"
|
"ngx-openlayers": ">=1.0.0-next.19",
|
||||||
|
"ol": ">=6.8.1",
|
||||||
|
"tassign": ">=1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"../../dist/libs/ng-openlayers": {
|
|
||||||
"version": "18.0.0",
|
|
||||||
"extraneous": true,
|
|
||||||
"license": "MPL-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@angular/common": "^18.2.3",
|
|
||||||
"@angular/core": "^18.2.3",
|
|
||||||
"ol": "^8.2.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"dist/ng-openlayers": {
|
|
||||||
"extraneous": true
|
|
||||||
},
|
|
||||||
"node_modules/@angular/common": {
|
|
||||||
"version": "18.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.3.tgz",
|
|
||||||
"integrity": "sha512-NFL4yXXImSCH7i1xnHykUjHa9vl9827fGiwSV2mnf7LjSUsyDzFD8/54dNuYN9OY8AUD+PnK0YdNro6cczVyIA==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@angular/core": "18.2.3",
|
|
||||||
"rxjs": "^6.5.3 || ^7.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@angular/core": {
|
|
||||||
"version": "18.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.3.tgz",
|
|
||||||
"integrity": "sha512-VGhMJxj7d0rYpqVfQrcGRB7EE/BCziotft/I/YPl6bOMPSAvMukG7DXQuJdYpNrr62ks78mlzHlZX/cdmB9Prw==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"rxjs": "^6.5.3 || ^7.4.0",
|
|
||||||
"zone.js": "~0.14.10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@angular/platform-browser": {
|
|
||||||
"version": "18.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.3.tgz",
|
|
||||||
"integrity": "sha512-M2ob4zN7tAcL2mx7U6KnZNqNFPFl9MlPBE0FrjQjIzAjU0wSYPIJXmaPu9aMUp9niyo+He5iX98I+URi2Yc99g==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@angular/animations": "18.2.3",
|
|
||||||
"@angular/common": "18.2.3",
|
|
||||||
"@angular/core": "18.2.3"
|
|
||||||
},
|
|
||||||
"peerDependenciesMeta": {
|
|
||||||
"@angular/animations": {
|
|
||||||
"optional": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@angular/router": {
|
|
||||||
"version": "18.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.3.tgz",
|
|
||||||
"integrity": "sha512-fvD9eSDIiIbeYoUokoWkXzu7/ZaxlzKPUHFqX1JuKuH5ciQDeT/d7lp4mj31Bxammhohzi3+z12THJYsCkj/iQ==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@angular/common": "18.2.3",
|
|
||||||
"@angular/core": "18.2.3",
|
|
||||||
"@angular/platform-browser": "18.2.3",
|
|
||||||
"rxjs": "^6.5.3 || ^7.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@ngrx/effects": {
|
|
||||||
"version": "18.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-18.0.2.tgz",
|
|
||||||
"integrity": "sha512-YojXcOD9Lsq4kl2HCjENccyUM/mOlgBdtddsg9j/ojzSUgu3ZuBVKLN3atrL2TJYkbMX1MN0RzafSkL3TPGFIA==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@ngrx/operators": "18.0.1",
|
|
||||||
"tslib": "^2.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@angular/core": "^18.0.0",
|
|
||||||
"@ngrx/store": "18.0.2",
|
|
||||||
"rxjs": "^6.5.3 || ^7.5.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@ngrx/operators": {
|
|
||||||
"version": "18.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-18.0.1.tgz",
|
|
||||||
"integrity": "sha512-M+QMrHNKgcuiLaRGZxJ4aQi5/OCRfKC4+T/63dsHyLFZ53/FFpF6a/ytSO1Q+tzOplZ5o99S+i8FVaZqNQ3LmQ==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"rxjs": "^6.5.3 || ^7.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@ngrx/router-store": {
|
|
||||||
"version": "18.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-18.0.2.tgz",
|
|
||||||
"integrity": "sha512-jUrQ/uJJ53x8O1XbN2YxH2GpRREZlwS5gRxlCoc4fWL4Us/uS1/K6+QfRmKBPtpTKBIixqsOb+dIUV5iwBrivA==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@angular/common": "^18.0.0",
|
|
||||||
"@angular/core": "^18.0.0",
|
|
||||||
"@angular/router": "^18.0.0",
|
|
||||||
"@ngrx/store": "18.0.2",
|
|
||||||
"rxjs": "^6.5.3 || ^7.5.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@ngrx/store": {
|
|
||||||
"version": "18.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@ngrx/store/-/store-18.0.2.tgz",
|
|
||||||
"integrity": "sha512-ajwv0+njsO4vzArp9esnFvs1wyUb1U1W8E8LSCKrcW2hWWo9o1Pezj+JRsdQwatxHfrrPFuTDyajsl6GQM/JSA==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@angular/core": "^18.0.0",
|
|
||||||
"rxjs": "^6.5.3 || ^7.5.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/deepmerge": {
|
|
||||||
"version": "4.3.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
|
|
||||||
"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
|
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.10.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/ngrx-store-localstorage": {
|
|
||||||
"version": "18.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ngrx-store-localstorage/-/ngrx-store-localstorage-18.0.0.tgz",
|
|
||||||
"integrity": "sha512-WoDePvMWiWF9LQHe+dTqbpm8lxoKCPoIvA0/1enIPTmdLQsOpdDKhMSD5YgwuqDusNfEik3QslProTFGyXZwtw==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"deepmerge": "^4.2.2",
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@angular/common": "^18.0.1",
|
|
||||||
"@angular/core": "^18.0.1",
|
|
||||||
"@ngrx/store": "^18.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/rxjs": {
|
|
||||||
"version": "7.8.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
|
|
||||||
"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/tassign": {
|
|
||||||
"version": "1.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/tassign/-/tassign-1.0.0.tgz",
|
|
||||||
"integrity": "sha512-k0Ti9f+A1R0BRdArEbiUHldd+A40kZ5qsiNSNk4czx61wkAoSZYjqkaQs0jC63AfgPdCXVPstDq2ZW5ZLRTCgw==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/tslib": {
|
"node_modules/tslib": {
|
||||||
"version": "2.7.0",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
|
||||||
"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
|
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
|
||||||
},
|
|
||||||
"node_modules/zone.js": {
|
|
||||||
"version": "0.14.10",
|
|
||||||
"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz",
|
|
||||||
"integrity": "sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==",
|
|
||||||
"peer": true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,11 +8,13 @@
|
|||||||
"tslib": "^2.0.0"
|
"tslib": "^2.0.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@angular/core": "18.2.3",
|
"@angular/core": ">=14.0.0",
|
||||||
"ngrx-store-localstorage": "^18.0.0",
|
"ngrx-store-localstorage": ">=14.0.0",
|
||||||
"@ngrx/effects": "^18.0.2",
|
"@ngrx/effects": ">=14.0.0",
|
||||||
"@ngrx/router-store": "^18.0.2",
|
"@ngrx/router-store":">=14.0.0",
|
||||||
"@ngrx/store": "^18.0.2",
|
"@ngrx/store":">=14.0.0",
|
||||||
"tassign": "^1.0.0"
|
"tassign": ">=1.0.0",
|
||||||
|
"ngx-openlayers": ">=1.0.0-next.19",
|
||||||
|
"ol": ">=6.8.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,7 +18,6 @@ export const SETPARENT = '[Map] SetParent';
|
|||||||
export const SETPERIOD = '[Map] SetPeriod';
|
export const SETPERIOD = '[Map] SetPeriod';
|
||||||
export const STARTSEARCH = '[Map] StartSearch';
|
export const STARTSEARCH = '[Map] StartSearch';
|
||||||
export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
|
export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
|
||||||
export const CLICKFEATURE = '[Map] ClickFeature';
|
|
||||||
export const SELECTFEATURE = '[Map] SelectFeature';
|
export const SELECTFEATURE = '[Map] SelectFeature';
|
||||||
export const SELECTITEM = '[Map] SelectItem';
|
export const SELECTITEM = '[Map] SelectItem';
|
||||||
export const SELECTITEMSUCCESS = '[Map] SelectItemSuccess';
|
export const SELECTITEMSUCCESS = '[Map] SelectItemSuccess';
|
||||||
@ -57,8 +56,7 @@ export const GETLAYERVALUE = '[Map] GetLayerValue'
|
|||||||
export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
|
export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
|
||||||
export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
|
export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
|
||||||
export const SETVIEWSTATE = '[Map] SetViewState'
|
export const SETVIEWSTATE = '[Map] SetViewState'
|
||||||
export const CLEARFEATURES = '[Map] ClearFeatures';
|
|
||||||
export const SETPANELEXTRAWIDE = '[Map] SetPanelExtraWide';
|
|
||||||
|
|
||||||
export class Clear implements Action {
|
export class Clear implements Action {
|
||||||
readonly type = CLEAR;
|
readonly type = CLEAR;
|
||||||
@ -113,12 +111,6 @@ export class StartSearchSuccess implements Action {
|
|||||||
constructor(public features: Array<Feature<Geometry>>, public query:IQueryState) { }
|
constructor(public features: Array<Feature<Geometry>>, public query:IQueryState) { }
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ClickFeature implements Action {
|
|
||||||
readonly type = CLICKFEATURE;
|
|
||||||
|
|
||||||
constructor(public feature:Feature<Geometry>) { }
|
|
||||||
}
|
|
||||||
|
|
||||||
export class SelectFeature implements Action {
|
export class SelectFeature implements Action {
|
||||||
readonly type = SELECTFEATURE;
|
readonly type = SELECTFEATURE;
|
||||||
|
|
||||||
@ -337,23 +329,12 @@ export class SetViewState implements Action {
|
|||||||
constructor(public enabled:boolean) {}
|
constructor(public enabled:boolean) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ClearFeatures implements Action {
|
|
||||||
readonly type = CLEARFEATURES;
|
|
||||||
constructor() {}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class SetPanelExtraWide implements Action {
|
|
||||||
readonly type = SETPANELEXTRAWIDE;
|
|
||||||
constructor(public panelExtraWide:boolean) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
export type Actions = SetMapState
|
export type Actions = SetMapState
|
||||||
| Init
|
| Init
|
||||||
| Clear
|
| Clear
|
||||||
| SetParent
|
| SetParent
|
||||||
| StartSearch
|
| StartSearch
|
||||||
| StartSearchSuccess
|
| StartSearchSuccess
|
||||||
| ClickFeature
|
|
||||||
| SelectFeature
|
| SelectFeature
|
||||||
| SelectItem
|
| SelectItem
|
||||||
| SelectItemSuccess
|
| SelectItemSuccess
|
||||||
@ -393,7 +374,5 @@ export type Actions = SetMapState
|
|||||||
| GetLayerValue
|
| GetLayerValue
|
||||||
| SetPeriod
|
| SetPeriod
|
||||||
| ToggleShowDataLayerSlide
|
| ToggleShowDataLayerSlide
|
||||||
| SetViewState
|
| SetViewState;
|
||||||
| ClearFeatures
|
|
||||||
| SetPanelExtraWide;
|
|
||||||
|
|
||||||
|
|||||||
@ -1,78 +1,78 @@
|
|||||||
|
import { NgModule ,ModuleWithProviders} from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||||
|
|
||||||
//external modules
|
//external modules
|
||||||
import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
|
import { AngularOpenlayersModule } from 'ngx-openlayers';
|
||||||
|
import { StoreModule, ActionReducer, MetaReducer } from '@ngrx/store';
|
||||||
import { EffectsModule } from '@ngrx/effects';
|
import { EffectsModule } from '@ngrx/effects';
|
||||||
import { ActionReducer, MetaReducer, StoreModule } from '@ngrx/store';
|
import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
|
||||||
import { AngularOpenlayersModule } from '@farmmaps/ng-openlayers';
|
|
||||||
|
|
||||||
//common modules
|
//common modules
|
||||||
import { AppCommonModule } from '@farmmaps/common';
|
import { AppCommonModule } from '@farmmaps/common';
|
||||||
|
|
||||||
import * as mapActions from './actions/map.actions';
|
|
||||||
import * as mapEffects from './effects/map.effects';
|
|
||||||
import { MODULE_NAME } from './module-name';
|
import { MODULE_NAME } from './module-name';
|
||||||
import * as mapReducers from './reducers/map.reducer';
|
import * as mapReducers from './reducers/map.reducer';
|
||||||
|
import * as mapActions from './actions/map.actions';
|
||||||
|
import * as mapEffects from './effects/map.effects';
|
||||||
|
|
||||||
import { IClickedFeature } from './models/clicked.feature';
|
import { IMapState} from './models/map.state';
|
||||||
import { IItemLayer, ItemLayer, ITemporalItemLayer, TemporalItemLayer } from './models/item.layer';
|
|
||||||
import { IMapState } from './models/map.state';
|
|
||||||
import { IPeriodState } from './models/period.state';
|
|
||||||
import { ISelectedFeatures } from './models/selected.features';
|
import { ISelectedFeatures } from './models/selected.features';
|
||||||
|
import { IItemLayer,ItemLayer,ITemporalItemLayer,TemporalItemLayer } from './models/item.layer';
|
||||||
|
import { IClickedFeature } from './models/clicked.feature';
|
||||||
|
import { IPeriodState } from './models/period.state';
|
||||||
|
|
||||||
// components
|
// components
|
||||||
import { MapRoutingModule } from './common-map-routing.module';
|
import { GpsLocation} from './components/aol/gps-location/gps-location.component';
|
||||||
import { FileDropTargetComponent } from './components/aol/file-drop-target/file-drop-target.component';
|
import {FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component';
|
||||||
import { GpsLocation } from './components/aol/gps-location/gps-location.component';
|
import { FeatureListFeatureCroppingschemeComponent} from './components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component';
|
||||||
import { ItemLayersComponent } from './components/aol/item-layers/item-layers.component';
|
import { ItemWidgetListComponent} from './components/item-widget-list/item-widget-list.component';
|
||||||
import { ItemVectorSourceComponent } from './components/aol/item-vector-source/item-vector-source.component';
|
import { AbstractItemListItemComponent, ItemListItemComponent, AbstractItemWidgetComponent } from './components/item-list-item/item-list-item.component';
|
||||||
import { LayerListComponent } from './components/aol/layer-list/layer-list.component';
|
|
||||||
import { LayerValuesComponent } from './components/aol/layer-values/layer-values.component';
|
|
||||||
import { LayerVectorImageComponent } from './components/aol/layer-vector-image/layer-vector-image.component';
|
|
||||||
import { PanToLocation } from './components/aol/pan-to-location/pan-to-location.component';
|
|
||||||
import { RotationResetComponent } from './components/aol/rotation-reset/rotation-reset.component';
|
|
||||||
import { ZoomToExtentComponent } from './components/aol/zoom-to-extent/zoom-to-extent.component';
|
|
||||||
import { FeatureListContainerComponent } from './components/feature-list-container/feature-list-container.component';
|
|
||||||
import { FeatureListCropfieldComponent } from './components/feature-list-cropfield/feature-list-cropfield.component';
|
|
||||||
import { FeatureListCroppingschemeComponent } from './components/feature-list-croppingscheme/feature-list-croppingscheme.component';
|
|
||||||
import { FeatureListFeatureContainerComponent } from './components/feature-list-feature-container/feature-list-feature-container.component';
|
|
||||||
import { FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component';
|
|
||||||
import { FeatureListFeatureCroppingschemeComponent } from './components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component';
|
|
||||||
import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from './components/feature-list-feature/feature-list-feature.component';
|
|
||||||
import { AbstractFeatureListComponent, FeatureListComponent } from './components/feature-list/feature-list.component';
|
|
||||||
import { GeometryThumbnailComponent } from './components/feature-thumbnail/feature-thumbnail.component';
|
|
||||||
import { ForChild } from './components/for-item/for-child.decorator';
|
|
||||||
import { ForItemType } from './components/for-item/for-itemtype.decorator';
|
|
||||||
import { ForPackage } from './components/for-item/for-package.decorator';
|
|
||||||
import { ForSourceTask } from './components/for-item/for-sourcetask.decorator';
|
|
||||||
import { ifZoomToShowDirective } from './components/if-zoom-to-show/if-zoom-to-show.directive';
|
|
||||||
import { ItemListItemContainerComponent } from './components/item-list-item-container/item-list-item-container.component';
|
import { ItemListItemContainerComponent } from './components/item-list-item-container/item-list-item-container.component';
|
||||||
import { AbstractItemListItemComponent, AbstractItemWidgetComponent, ItemListItemComponent } from './components/item-list-item/item-list-item.component';
|
import { AbstractItemListComponent,ItemListComponent} from './components/item-list/item-list.component';
|
||||||
import { AbstractItemListComponent, ItemListComponent } from './components/item-list/item-list.component';
|
import { AbstractSelectedItemComponent, SelectedItemComponent } from './components/selected-item/selected-item.component';
|
||||||
import { ItemWidgetListComponent } from './components/item-widget-list/item-widget-list.component';
|
|
||||||
import { LayerSwitcher } from './components/layer-switcher/layer-switcher.component';
|
|
||||||
import { HistogramDetailsComponent } from './components/legend/histogram-details/histogram-details.component';
|
|
||||||
import { LegendComponent } from './components/legend/legend.component';
|
|
||||||
import { StatisticsDetailsComponent } from './components/legend/statistics-details/statistics-details.component';
|
|
||||||
import { MapSearchComponent } from './components/map-search/map-search.component';
|
|
||||||
import { MapComponent } from './components/map/map.component';
|
|
||||||
import { MetaDataModalComponent } from './components/meta-data-modal/meta-data-modal.component';
|
|
||||||
import { SelectPeriodModalComponent } from './components/select-period-modal/select-period-modal.component';
|
|
||||||
import { SelectedItemContainerComponent } from './components/selected-item-container/selected-item-container.component';
|
|
||||||
import { SelectedItemCropfieldComponent } from './components/selected-item-cropfield/selected-item-cropfield.component';
|
import { SelectedItemCropfieldComponent } from './components/selected-item-cropfield/selected-item-cropfield.component';
|
||||||
import { SelectedItemGeotiffComponent } from './components/selected-item-geotiff/selected-item-geotiff.component';
|
import { SelectedItemGeotiffComponent } from './components/selected-item-geotiff/selected-item-geotiff.component';
|
||||||
import { SelectedItemShapeComponent } from './components/selected-item-shape/selected-item-shape.component';
|
import { SelectedItemTemporalComponent} from './components/selected-item-temporal/selected-item-temporal.component';
|
||||||
import { SelectedItemTemporalComponent } from './components/selected-item-temporal/selected-item-temporal.component';
|
import {SelectedItemShapeComponent } from './components/selected-item-shape/selected-item-shape.component';
|
||||||
import { AbstractSelectedItemComponent, SelectedItemComponent } from './components/selected-item/selected-item.component';
|
import { SelectedItemContainerComponent } from './components/selected-item-container/selected-item-container.component';
|
||||||
import { WidgetHostDirective } from './components/widget-host/widget-host.directive';
|
import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from './components/feature-list-feature/feature-list-feature.component';
|
||||||
import { WidgetStatusComponent } from './components/widget-status/widget-status.component';
|
import {FeatureListFeatureContainerComponent } from './components/feature-list-feature-container/feature-list-feature-container.component';
|
||||||
import { ZoomToShowAlert } from './components/zoom-to-show-alert/zoom-to-show-alert.component';
|
import { FeatureListCroppingschemeComponent } from './components/feature-list-croppingscheme/feature-list-croppingscheme.component';
|
||||||
import { DeviceOrientationService } from './services/device-orientation.service';
|
import {FeatureListCropfieldComponent } from './components/feature-list-cropfield/feature-list-cropfield.component';
|
||||||
import { FeatureIconService } from './services/feature-icon.service';
|
import {FeatureListContainerComponent } from './components/feature-list-container/feature-list-container.component';
|
||||||
|
import { WidgetHostDirective} from './components/widget-host/widget-host.directive';
|
||||||
|
import { FeatureListComponent,AbstractFeatureListComponent} from './components/feature-list/feature-list.component';
|
||||||
|
import { FileDropTargetComponent } from './components/aol/file-drop-target/file-drop-target.component';
|
||||||
|
import { ItemVectorSourceComponent } from './components/aol/item-vector-source/item-vector-source.component';
|
||||||
|
import { ItemLayersComponent } from './components/aol/item-layers/item-layers.component';
|
||||||
|
import { ZoomToExtentComponent } from './components/aol/zoom-to-extent/zoom-to-extent.component';
|
||||||
|
import { RotationResetComponent } from './components/aol/rotation-reset/rotation-reset.component';
|
||||||
|
import { LayerListComponent } from './components/aol/layer-list/layer-list.component';
|
||||||
|
import { MetaDataModalComponent } from './components/meta-data-modal/meta-data-modal.component';
|
||||||
|
import { SelectPeriodModalComponent } from './components/select-period-modal/select-period-modal.component';
|
||||||
|
import { MapComponent } from './components/map/map.component';
|
||||||
|
import { MapSearchComponent } from './components/map-search/map-search.component';
|
||||||
|
import { MapRoutingModule } from './common-map-routing.module';
|
||||||
|
import { LegendComponent } from './components/legend/legend.component';
|
||||||
|
import { LayerVectorImageComponent } from './components/aol/layer-vector-image/layer-vector-image.component';
|
||||||
|
import {FeatureIconService} from './services/feature-icon.service';
|
||||||
import { GeolocationService } from './services/geolocation.service';
|
import { GeolocationService } from './services/geolocation.service';
|
||||||
import { TemporalService } from './services/temporal.service';
|
import {DeviceOrientationService} from './services/device-orientation.service';
|
||||||
|
import { TemporalService} from './services/temporal.service';
|
||||||
|
import { WidgetStatusComponent } from './components/widget-status/widget-status.component';
|
||||||
|
import { ForChild} from './components/for-item/for-child.decorator';
|
||||||
|
import {ForItemType } from './components/for-item/for-itemtype.decorator';
|
||||||
|
import { ForSourceTask} from './components/for-item/for-sourcetask.decorator';
|
||||||
|
import { ForPackage } from './components/for-item/for-package.decorator';
|
||||||
|
import { PanToLocation} from './components/aol/pan-to-location/pan-to-location.component';
|
||||||
|
import {LayerSwitcher} from './components/layer-switcher/layer-switcher.component';
|
||||||
|
import {HistogramDetailsComponent} from './components/legend/histogram-details/histogram-details.component';
|
||||||
|
import {StatisticsDetailsComponent} from './components/legend/statistics-details/statistics-details.component';
|
||||||
|
import { ifZoomToShowDirective} from './components/if-zoom-to-show/if-zoom-to-show.directive';
|
||||||
|
import { ZoomToShowAlert} from './components/zoom-to-show-alert/zoom-to-show-alert.component';
|
||||||
|
import { LayerValuesComponent } from './components/aol/layer-values/layer-values.component';
|
||||||
|
import { GeometryThumbnailComponent } from './components/feature-thumbnail/feature-thumbnail.component';
|
||||||
|
|
||||||
export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any> {
|
export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any> {
|
||||||
const r = function(state, action) {
|
const r = function(state, action) {
|
||||||
@ -104,127 +104,184 @@ export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any
|
|||||||
const metaReducers: Array<MetaReducer<any, any>> = [LocalStorageSync];
|
const metaReducers: Array<MetaReducer<any, any>> = [LocalStorageSync];
|
||||||
|
|
||||||
export {
|
export {
|
||||||
|
mapEffects,
|
||||||
|
mapReducers,
|
||||||
|
mapActions,
|
||||||
|
ZoomToExtentComponent,
|
||||||
|
ItemVectorSourceComponent,
|
||||||
|
ItemLayersComponent,
|
||||||
|
FileDropTargetComponent,
|
||||||
|
MapComponent,
|
||||||
|
MetaDataModalComponent,
|
||||||
|
RotationResetComponent,
|
||||||
|
MapSearchComponent,
|
||||||
|
SelectPeriodModalComponent,
|
||||||
|
LayerListComponent,
|
||||||
|
LegendComponent,
|
||||||
|
LayerVectorImageComponent,
|
||||||
|
FeatureListComponent,
|
||||||
|
WidgetHostDirective,
|
||||||
|
FeatureListContainerComponent,
|
||||||
|
FeatureListCroppingschemeComponent,
|
||||||
|
FeatureListCropfieldComponent,
|
||||||
|
FeatureListFeatureContainerComponent,
|
||||||
|
FeatureListFeatureComponent,
|
||||||
|
FeatureListFeatureCroppingschemeComponent,
|
||||||
|
FeatureListFeatureCropfieldComponent,
|
||||||
|
SelectedItemContainerComponent,
|
||||||
|
SelectedItemComponent,
|
||||||
|
SelectedItemCropfieldComponent,
|
||||||
|
SelectedItemGeotiffComponent,
|
||||||
|
SelectedItemTemporalComponent,
|
||||||
|
SelectedItemShapeComponent,
|
||||||
|
ItemListItemComponent,
|
||||||
|
ItemListItemContainerComponent,
|
||||||
|
ItemListComponent,
|
||||||
|
ItemWidgetListComponent,
|
||||||
|
WidgetStatusComponent,
|
||||||
|
GpsLocation,
|
||||||
|
PanToLocation,
|
||||||
|
LayerSwitcher,
|
||||||
AbstractFeatureListComponent,
|
AbstractFeatureListComponent,
|
||||||
AbstractFeatureListFeatureComponent, AbstractItemListComponent, AbstractItemListItemComponent, AbstractItemWidgetComponent, AbstractSelectedItemComponent, DeviceOrientationService, FeatureIconService, FeatureListComponent, FeatureListContainerComponent, FeatureListCropfieldComponent, FeatureListCroppingschemeComponent, FeatureListFeatureComponent, FeatureListFeatureContainerComponent, FeatureListFeatureCropfieldComponent, FeatureListFeatureCroppingschemeComponent, FileDropTargetComponent, ForChild,
|
AbstractFeatureListFeatureComponent,
|
||||||
ForItemType, ForPackage, ForSourceTask, GeolocationService, GeometryThumbnailComponent, GpsLocation, IClickedFeature, ifZoomToShowDirective, IItemLayer, IMapState, IPeriodState, ISelectedFeatures, ItemLayer, ItemLayersComponent, ItemListComponent, ItemListItemComponent,
|
AbstractSelectedItemComponent,
|
||||||
ItemListItemContainerComponent, ITemporalItemLayer, ItemVectorSourceComponent, ItemWidgetListComponent, LayerListComponent, LayerSwitcher, LayerVectorImageComponent, LegendComponent, mapActions, MapComponent, mapEffects,
|
AbstractItemWidgetComponent,
|
||||||
mapReducers, MapSearchComponent, MetaDataModalComponent, PanToLocation, RotationResetComponent, SelectedItemComponent, SelectedItemContainerComponent, SelectedItemCropfieldComponent,
|
AbstractItemListItemComponent,
|
||||||
SelectedItemGeotiffComponent, SelectedItemShapeComponent, SelectedItemTemporalComponent, SelectPeriodModalComponent, TemporalItemLayer, TemporalService, WidgetHostDirective, WidgetStatusComponent, ZoomToExtentComponent, ZoomToShowAlert
|
AbstractItemListComponent,
|
||||||
};
|
FeatureIconService,
|
||||||
|
GeolocationService,
|
||||||
|
DeviceOrientationService,
|
||||||
|
TemporalService,
|
||||||
|
IMapState,
|
||||||
|
ISelectedFeatures,
|
||||||
|
IItemLayer,
|
||||||
|
ItemLayer,
|
||||||
|
IPeriodState,
|
||||||
|
ForChild,
|
||||||
|
ForItemType,
|
||||||
|
ForSourceTask,
|
||||||
|
ForPackage ,
|
||||||
|
ITemporalItemLayer,
|
||||||
|
TemporalItemLayer,
|
||||||
|
ifZoomToShowDirective,
|
||||||
|
ZoomToShowAlert,
|
||||||
|
IClickedFeature,
|
||||||
|
GeometryThumbnailComponent
|
||||||
|
}
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
AngularOpenlayersModule,
|
AngularOpenlayersModule,
|
||||||
MapRoutingModule,
|
MapRoutingModule,
|
||||||
StoreModule.forFeature(MODULE_NAME, mapReducers.reducer, { metaReducers: metaReducers }),
|
StoreModule.forFeature(MODULE_NAME, mapReducers.reducer, { metaReducers: metaReducers }),
|
||||||
EffectsModule.forFeature([mapEffects.MapEffects]),
|
EffectsModule.forFeature([mapEffects.MapEffects]),
|
||||||
NgbModule,
|
NgbModule,
|
||||||
FormsModule,
|
FormsModule,
|
||||||
ReactiveFormsModule,
|
ReactiveFormsModule,
|
||||||
AppCommonModule
|
AppCommonModule
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
ZoomToExtentComponent,
|
ZoomToExtentComponent,
|
||||||
ItemVectorSourceComponent,
|
ItemVectorSourceComponent,
|
||||||
ItemLayersComponent,
|
ItemLayersComponent,
|
||||||
FileDropTargetComponent,
|
FileDropTargetComponent,
|
||||||
MapComponent,
|
MapComponent,
|
||||||
MetaDataModalComponent,
|
MetaDataModalComponent,
|
||||||
RotationResetComponent,
|
RotationResetComponent,
|
||||||
MapSearchComponent,
|
MapSearchComponent,
|
||||||
SelectPeriodModalComponent,
|
SelectPeriodModalComponent,
|
||||||
LayerListComponent,
|
LayerListComponent,
|
||||||
LegendComponent,
|
LegendComponent,
|
||||||
LayerVectorImageComponent,
|
LayerVectorImageComponent,
|
||||||
FeatureListComponent,
|
FeatureListComponent,
|
||||||
WidgetHostDirective,
|
WidgetHostDirective,
|
||||||
FeatureListContainerComponent,
|
FeatureListContainerComponent,
|
||||||
FeatureListCroppingschemeComponent,
|
FeatureListCroppingschemeComponent,
|
||||||
FeatureListCropfieldComponent,
|
FeatureListCropfieldComponent,
|
||||||
FeatureListFeatureContainerComponent,
|
FeatureListFeatureContainerComponent,
|
||||||
FeatureListFeatureComponent,
|
FeatureListFeatureComponent,
|
||||||
FeatureListFeatureCroppingschemeComponent,
|
FeatureListFeatureCroppingschemeComponent,
|
||||||
FeatureListFeatureCropfieldComponent,
|
FeatureListFeatureCropfieldComponent,
|
||||||
SelectedItemContainerComponent,
|
SelectedItemContainerComponent,
|
||||||
SelectedItemComponent,
|
SelectedItemComponent,
|
||||||
SelectedItemCropfieldComponent,
|
SelectedItemCropfieldComponent,
|
||||||
SelectedItemGeotiffComponent,
|
SelectedItemGeotiffComponent,
|
||||||
SelectedItemTemporalComponent,
|
SelectedItemTemporalComponent,
|
||||||
SelectedItemShapeComponent,
|
SelectedItemShapeComponent,
|
||||||
ItemListItemComponent,
|
ItemListItemComponent,
|
||||||
ItemListItemContainerComponent,
|
ItemListItemContainerComponent,
|
||||||
ItemListComponent,
|
ItemListComponent,
|
||||||
ItemWidgetListComponent,
|
ItemWidgetListComponent,
|
||||||
WidgetStatusComponent,
|
WidgetStatusComponent,
|
||||||
GpsLocation,
|
GpsLocation,
|
||||||
PanToLocation,
|
PanToLocation,
|
||||||
LayerSwitcher,
|
LayerSwitcher,
|
||||||
HistogramDetailsComponent,
|
HistogramDetailsComponent,
|
||||||
StatisticsDetailsComponent,
|
StatisticsDetailsComponent,
|
||||||
ifZoomToShowDirective,
|
ifZoomToShowDirective,
|
||||||
ZoomToShowAlert,
|
ZoomToShowAlert,
|
||||||
LayerValuesComponent,
|
LayerValuesComponent,
|
||||||
GeometryThumbnailComponent
|
GeometryThumbnailComponent
|
||||||
],
|
],
|
||||||
exports: [
|
exports: [
|
||||||
ItemVectorSourceComponent,
|
ItemVectorSourceComponent,
|
||||||
ItemLayersComponent,
|
ItemLayersComponent,
|
||||||
FileDropTargetComponent,
|
FileDropTargetComponent,
|
||||||
MetaDataModalComponent,
|
MetaDataModalComponent,
|
||||||
MapComponent,
|
MapComponent,
|
||||||
GpsLocation,
|
GpsLocation,
|
||||||
PanToLocation,
|
PanToLocation,
|
||||||
LayerSwitcher,
|
LayerSwitcher,
|
||||||
FeatureListFeatureComponent,
|
FeatureListFeatureComponent,
|
||||||
FeatureListFeatureCropfieldComponent,
|
FeatureListFeatureCropfieldComponent,
|
||||||
FeatureListFeatureCroppingschemeComponent,
|
FeatureListFeatureCroppingschemeComponent,
|
||||||
SelectedItemContainerComponent,
|
SelectedItemContainerComponent,
|
||||||
SelectedItemComponent,
|
SelectedItemComponent,
|
||||||
SelectedItemCropfieldComponent,
|
SelectedItemCropfieldComponent,
|
||||||
SelectedItemGeotiffComponent,
|
SelectedItemGeotiffComponent,
|
||||||
SelectedItemTemporalComponent,
|
SelectedItemTemporalComponent,
|
||||||
SelectedItemShapeComponent,
|
SelectedItemShapeComponent,
|
||||||
ItemListItemComponent,
|
ItemListItemComponent,
|
||||||
ItemListItemContainerComponent,
|
ItemListItemContainerComponent,
|
||||||
ItemListComponent,
|
ItemListComponent,
|
||||||
ItemWidgetListComponent,
|
ItemWidgetListComponent,
|
||||||
WidgetStatusComponent,
|
WidgetStatusComponent,
|
||||||
RotationResetComponent,
|
RotationResetComponent,
|
||||||
MapSearchComponent,
|
MapSearchComponent,
|
||||||
SelectPeriodModalComponent,
|
SelectPeriodModalComponent,
|
||||||
LayerListComponent,
|
LayerListComponent,
|
||||||
LegendComponent,
|
LegendComponent,
|
||||||
LayerVectorImageComponent,
|
LayerVectorImageComponent,
|
||||||
FeatureListComponent,
|
FeatureListComponent,
|
||||||
WidgetHostDirective,
|
WidgetHostDirective,
|
||||||
FeatureListContainerComponent,
|
FeatureListContainerComponent,
|
||||||
FeatureListCroppingschemeComponent,
|
FeatureListCroppingschemeComponent,
|
||||||
FeatureListCropfieldComponent,
|
FeatureListCropfieldComponent,
|
||||||
FeatureListFeatureContainerComponent,
|
FeatureListFeatureContainerComponent,
|
||||||
ZoomToExtentComponent,
|
ZoomToExtentComponent,
|
||||||
ifZoomToShowDirective,
|
ifZoomToShowDirective,
|
||||||
ZoomToShowAlert,
|
ZoomToShowAlert,
|
||||||
GeometryThumbnailComponent
|
GeometryThumbnailComponent
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
FeatureIconService,
|
FeatureIconService,
|
||||||
GeolocationService,
|
GeolocationService,
|
||||||
DeviceOrientationService,
|
DeviceOrientationService,
|
||||||
TemporalService,
|
TemporalService,
|
||||||
{ provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
|
{ provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
|
||||||
{ provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
|
{ provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
|
||||||
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
|
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
|
||||||
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
|
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
|
||||||
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
|
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
|
||||||
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
|
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
|
||||||
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
|
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
|
||||||
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
|
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
|
||||||
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
|
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
|
||||||
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
|
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
|
||||||
{ provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
|
{ provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
|
||||||
{ provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
|
{ provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Input, OnDestroy, OnInit, EventEmitter, Output, Inject } from '@angular/core';
|
import { Component, Input, OnDestroy, OnInit, EventEmitter, Output, Inject } from '@angular/core';
|
||||||
import { MapComponent } from '@farmmaps/ng-openlayers';
|
import { MapComponent } from 'ngx-openlayers';
|
||||||
|
|
||||||
import * as proj from 'ol/proj';
|
import * as proj from 'ol/proj';
|
||||||
import {Point,Geometry} from 'ol/geom';
|
import {Point,Geometry} from 'ol/geom';
|
||||||
|
|||||||
@ -1,3 +1,6 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
|
|
||||||
.gps-location {
|
.gps-location {
|
||||||
display:none;
|
display:none;
|
||||||
}
|
}
|
||||||
@ -11,7 +14,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.tolerance {
|
.tolerance {
|
||||||
fill: var(--bs-primary);
|
fill: $primary;
|
||||||
fill-opacity:0.4;
|
fill-opacity:0.4;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -20,20 +23,20 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.border {
|
.border {
|
||||||
fill: var(--bs-white);
|
fill: $white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.center {
|
.center {
|
||||||
fill: var(--bs-primary);
|
fill: $primary;
|
||||||
}
|
}
|
||||||
|
|
||||||
.stop1 {
|
.stop1 {
|
||||||
stop-color: var(--bs-primary);
|
stop-color: $primary;
|
||||||
stop-opacity:1;
|
stop-opacity:1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.stop2 {
|
.stop2 {
|
||||||
stop-color:var(--bs-primary);
|
stop-color:$primary;
|
||||||
stop-opacity: 0;
|
stop-opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges ,Host} from '@angular/core';
|
import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges ,Host} from '@angular/core';
|
||||||
import { MapComponent } from '@farmmaps/ng-openlayers';
|
import { MapComponent } from 'ngx-openlayers';
|
||||||
import Overlay from 'ol/Overlay';
|
import Overlay from 'ol/Overlay';
|
||||||
import { fromLonLat, toLonLat } from 'ol/proj';
|
import { fromLonLat, toLonLat } from 'ol/proj';
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Host, Input, Output, EventEmitter,OnDestroy, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
|
import { Component, Host, Input, Output, EventEmitter,OnDestroy, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
|
||||||
import { LayerGroupComponent, MapComponent } from '@farmmaps/ng-openlayers';
|
import { LayerGroupComponent, MapComponent } from 'ngx-openlayers';
|
||||||
import { ItemService,IItem,AppConfig } from '@farmmaps/common';
|
import { ItemService,IItem,AppConfig } from '@farmmaps/common';
|
||||||
import { IItemLayer, ITemporalItemLayer} from '../../../models/item.layer';
|
import { IItemLayer, ITemporalItemLayer} from '../../../models/item.layer';
|
||||||
import { ILayerData} from '../../../models/layer.data';
|
import { ILayerData} from '../../../models/layer.data';
|
||||||
@ -19,7 +19,6 @@ import VectorTileLayer from 'ol/layer/VectorTile';
|
|||||||
import {GeoJSON,MVT} from 'ol/format';
|
import {GeoJSON,MVT} from 'ol/format';
|
||||||
import { Geometry } from 'ol/geom';
|
import { Geometry } from 'ol/geom';
|
||||||
import BaseLayer from 'ol/layer/Base';
|
import BaseLayer from 'ol/layer/Base';
|
||||||
import Feature from 'ol/Feature';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-item-layers',
|
selector: 'fm-map-item-layers',
|
||||||
@ -181,9 +180,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
|||||||
const source = new VectorSource({
|
const source = new VectorSource({
|
||||||
strategy: loadingstrategy.bbox,
|
strategy: loadingstrategy.bbox,
|
||||||
loader: function (extent: Extent, resolution: number, projection: Projection) {
|
loader: function (extent: Extent, resolution: number, projection: Projection) {
|
||||||
const source = this as VectorSource<Feature<Geometry>>;
|
const source = this as VectorSource<Geometry>;
|
||||||
__this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
|
__this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
|
||||||
const features = format.readFeatures(data).filter(feature => feature instanceof Feature) as Feature[];
|
const features = format.readFeatures(data);
|
||||||
for (const f of features) {
|
for (const f of features) {
|
||||||
if (f.get("code")) {
|
if (f.get("code")) {
|
||||||
f.setId(f.get("code"));
|
f.setId(f.get("code"));
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken, OnDestroy, LOCALE_ID } from '@angular/core';
|
import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken, OnDestroy, LOCALE_ID } from '@angular/core';
|
||||||
import { LayerVectorComponent, SourceVectorComponent, MapComponent } from '@farmmaps/ng-openlayers';
|
import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ngx-openlayers';
|
||||||
import { ItemService, ItemTypeService, IItem, IItemType, FolderService } from '@farmmaps/common';
|
import { ItemService, ItemTypeService, IItem, IItemType, FolderService } from '@farmmaps/common';
|
||||||
|
|
||||||
import { Feature } from 'ol';
|
import { Feature } from 'ol';
|
||||||
@ -29,7 +29,7 @@ import { formatNumber } from '@angular/common';
|
|||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnDestroy, OnChanges {
|
export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnDestroy, OnChanges {
|
||||||
instance: Vector<Feature<Geometry>>;
|
instance: Vector<Geometry>;
|
||||||
private _format: GeoJSON;
|
private _format: GeoJSON;
|
||||||
private _select: Select;
|
private _select: Select;
|
||||||
private _hoverSelect: Select;
|
private _hoverSelect: Select;
|
||||||
@ -83,7 +83,6 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
|
|||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.sub = this.folderService.getFolder('my_settings').subscribe(
|
this.sub = this.folderService.getFolder('my_settings').subscribe(
|
||||||
userSettingsRoot => {
|
userSettingsRoot => {
|
||||||
if (userSettingsRoot == undefined) return;
|
|
||||||
this.itemService.getChildItemList(userSettingsRoot.code, 'vnd.farmmaps.itemtype.settings.general').subscribe(
|
this.itemService.getChildItemList(userSettingsRoot.code, 'vnd.farmmaps.itemtype.settings.general').subscribe(
|
||||||
items => {
|
items => {
|
||||||
if (items && items.length > 0 && items[0].data?.displayMapFeatureSettings) {
|
if (items && items.length > 0 && items[0].data?.displayMapFeatureSettings) {
|
||||||
|
|||||||
@ -3,7 +3,7 @@ import { IItemLayer } from '../../../models/item.layer';
|
|||||||
import { Store } from '@ngrx/store';
|
import { Store } from '@ngrx/store';
|
||||||
import * as mapReducers from '../../../reducers/map.reducer';
|
import * as mapReducers from '../../../reducers/map.reducer';
|
||||||
import * as mapActions from '../../../actions/map.actions';
|
import * as mapActions from '../../../actions/map.actions';
|
||||||
import { MapComponent } from '@farmmaps/ng-openlayers';
|
import { MapComponent } from 'ngx-openlayers';
|
||||||
import { ILayervalue } from '../../../models/layer.value';
|
import { ILayervalue } from '../../../models/layer.value';
|
||||||
import { Observable, interval, Subject } from 'rxjs';
|
import { Observable, interval, Subject } from 'rxjs';
|
||||||
import { debounce, throttle } from 'rxjs/operators';
|
import { debounce, throttle } from 'rxjs/operators';
|
||||||
|
|||||||
@ -1,9 +1,8 @@
|
|||||||
import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
|
import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
|
||||||
import { LayerVectorComponent, MapComponent } from '@farmmaps/ng-openlayers';
|
import { LayerVectorComponent, MapComponent } from 'ngx-openlayers';
|
||||||
import RenderType from 'ol/layer/Vector';
|
import RenderType from 'ol/layer/Vector';
|
||||||
import { Vector as VectorSource } from 'ol/source';
|
import { Vector as VectorSource } from 'ol/source';
|
||||||
import { Geometry } from 'ol/geom';
|
import { Geometry } from 'ol/geom';
|
||||||
import Feature from 'ol/Feature';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-aol-layer-vector-image',
|
selector: 'fm-map-aol-layer-vector-image',
|
||||||
@ -15,7 +14,7 @@ export class LayerVectorImageComponent extends LayerVectorComponent implements O
|
|||||||
//public source: Vector;
|
//public source: Vector;
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
renderMode: RenderType<VectorSource<Feature<Geometry>>> | string = "image";
|
renderMode: RenderType<VectorSource<Geometry>> | string = "image";
|
||||||
|
|
||||||
constructor(map: MapComponent) {
|
constructor(map: MapComponent) {
|
||||||
super(map);
|
super(map);
|
||||||
|
|||||||
@ -1,8 +1,11 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
|
|
||||||
.gps-location {
|
.gps-location {
|
||||||
display:block;
|
display:block;
|
||||||
width:2.5em;
|
width:2.5em;
|
||||||
height:2.5em;
|
height:2.5em;
|
||||||
background-color: var(--bs-body-bg);
|
background-color: $body-bg;
|
||||||
background-size: contain;
|
background-size: contain;
|
||||||
margin-top:0.5em;
|
margin-top:0.5em;
|
||||||
border-radius: 1.75em;
|
border-radius: 1.75em;
|
||||||
@ -14,15 +17,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.pan-to {
|
.pan-to {
|
||||||
fill: var(--bs-secondary);
|
fill: $secondary;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.gps-location:hover .pan-to {
|
div.gps-location:hover .pan-to {
|
||||||
fill: var(--bs-white);
|
fill: $white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pan-to-centered {
|
.pan-to-centered {
|
||||||
fill: var(--bs-primary);
|
fill: $primary;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.gps-location:hover .pan-to-centered {
|
div.gps-location:hover .pan-to-centered {
|
||||||
@ -30,5 +33,5 @@ div.gps-location:hover .pan-to-centered {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.pan-to.pan-to-disabled {
|
.pan-to.pan-to-disabled {
|
||||||
fill: var(--bs-gray-300);
|
fill: $gray-300;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, OnInit, Input, Host, OnChanges, SimpleChanges,ChangeDetectorRef } from '@angular/core';
|
import { Component, OnInit, Input, Host, OnChanges, SimpleChanges,ChangeDetectorRef } from '@angular/core';
|
||||||
import { MapComponent } from '@farmmaps/ng-openlayers';
|
import { MapComponent } from 'ngx-openlayers';
|
||||||
import {IMapState} from '../../../models/map.state'
|
import {IMapState} from '../../../models/map.state'
|
||||||
import {View} from 'ol';
|
import {View} from 'ol';
|
||||||
import { fromLonLat } from 'ol/proj';
|
import { fromLonLat } from 'ol/proj';
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
.compass {
|
.compass {
|
||||||
width:2.5em;
|
width:2.5em;
|
||||||
height:2.5em;
|
height:2.5em;
|
||||||
@ -11,7 +13,7 @@
|
|||||||
|
|
||||||
#north {
|
#north {
|
||||||
display: none;
|
display: none;
|
||||||
fill:var(--bs-black);
|
fill:$black;
|
||||||
}
|
}
|
||||||
|
|
||||||
#top-l {
|
#top-l {
|
||||||
@ -31,23 +33,23 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
div.compass:hover #top-l {
|
div.compass:hover #top-l {
|
||||||
fill:var(--bs-white);
|
fill:$white;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.compass:hover #top-r {
|
div.compass:hover #top-r {
|
||||||
fill:var(--bs-gray-300);
|
fill:$gray-300;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.compass:hover #bottom-l {
|
div.compass:hover #bottom-l {
|
||||||
fill:var(--bs-gray-300);
|
fill:$gray-300;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.compass:hover #bottom-r {
|
div.compass:hover #bottom-r {
|
||||||
fill:var(--bs-white);
|
fill:$white;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.compass:hover #north {
|
div.compass:hover #north {
|
||||||
fill:var(--bs-white);
|
fill:$white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.compass-n {
|
.compass-n {
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, Host, Input, OnInit, ChangeDetectorRef } from '@angular/core';
|
import { Component, Host, Input, OnInit, ChangeDetectorRef } from '@angular/core';
|
||||||
import { ViewComponent, MapComponent } from '@farmmaps/ng-openlayers';
|
import { ViewComponent, MapComponent } from 'ngx-openlayers';
|
||||||
|
|
||||||
import {View} from 'ol';
|
import {View} from 'ol';
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { Component, Host, Input, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
|
import { Component, Host, Input, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
|
||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
import { ViewComponent, MapComponent } from '@farmmaps/ng-openlayers';
|
import { ViewComponent, MapComponent } from 'ngx-openlayers';
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
|||||||
@ -1,10 +1,14 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.row {
|
.row {
|
||||||
border-bottom: 1px solid var(--bs-gray-500);
|
border-bottom: 1px solid $gray-500;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.row.selected {
|
.row.selected {
|
||||||
background-color: var(--bs-gray-100);
|
background-color: $gray-100;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 44rem) {
|
@media screen and (min-width: 44rem) {
|
||||||
|
|||||||
@ -64,9 +64,9 @@ export class FeatureListContainerComponent {
|
|||||||
viewContainerRef.clear();
|
viewContainerRef.clear();
|
||||||
if(showItem) {
|
if(showItem) {
|
||||||
this.componentRef = viewContainerRef.createComponent(componentFactory);
|
this.componentRef = viewContainerRef.createComponent(componentFactory);
|
||||||
(<AbstractFeatureListComponent>this.componentRef.instance).features = this.features;
|
(<AbstractFeatureListComponent>this.componentRef.instance).features = null;
|
||||||
(<AbstractFeatureListComponent>this.componentRef.instance).queryState = this.queryState;
|
(<AbstractFeatureListComponent>this.componentRef.instance).queryState = queryState;
|
||||||
(<AbstractFeatureListComponent>this.componentRef.instance).selectedFeature = this.selectedFeature;
|
(<AbstractFeatureListComponent>this.componentRef.instance).selectedFeature = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,20 +1,22 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
fm-map-feature-list-feature-container {
|
fm-map-feature-list-feature-container {
|
||||||
width:100%;
|
width:100%;
|
||||||
pointer-events:none;
|
pointer-events:none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.row {
|
.row {
|
||||||
border-bottom: 1px solid var(--bs-gray-500);
|
border-bottom: 1px solid $gray-500;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
padding-left:1.5rem;
|
padding-left:1.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.row.selected {
|
.row.selected {
|
||||||
background-color: var(--bs-gray-100);
|
background-color: $gray-100;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cropfields {
|
.cropfields {
|
||||||
border-top: 1px solid var(--bs-gray-500);
|
border-top: 1px solid $gray-500;
|
||||||
margin-left: -1.25rem;
|
margin-left: -1.25rem;
|
||||||
margin-right: -1.25rem;
|
margin-right: -1.25rem;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,20 +1,22 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
fm-map-feature-list-feature-container {
|
fm-map-feature-list-feature-container {
|
||||||
width:100%;
|
width:100%;
|
||||||
pointer-events:none;
|
pointer-events:none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.row {
|
.row {
|
||||||
border-bottom: 1px solid var(--bs-gray-500);
|
border-bottom: 1px solid $gray-500;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
padding-left:1.5rem;
|
padding-left:1.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.row.selected {
|
.row.selected {
|
||||||
background-color: var(--bs-gray-100);
|
background-color: $gray-100;
|
||||||
}
|
}
|
||||||
|
|
||||||
.farms {
|
.farms {
|
||||||
border-top: 1px solid var(--bs-gray-500);
|
border-top: 1px solid $gray-500;
|
||||||
margin-left: -1.25rem;
|
margin-left: -1.25rem;
|
||||||
margin-right: -1.25rem;
|
margin-right: -1.25rem;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,3 +1,7 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.card-title {
|
.card-title {
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|||||||
@ -1,3 +1,7 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.card-title {
|
.card-title {
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|||||||
@ -1,3 +1,7 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.card-title {
|
.card-title {
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|||||||
@ -1,13 +1,15 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
fm-map-feature-list-feature-container {
|
fm-map-feature-list-feature-container {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.row {
|
.row {
|
||||||
border-bottom: 1px solid var(--bs-gray-500);
|
border-bottom: 1px solid $gray-500;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.row.selected {
|
.row.selected {
|
||||||
background-color: var(--bs-gray-100);
|
background-color: $gray-100;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,9 +23,8 @@ export abstract class AbstractFeatureListComponent {
|
|||||||
|
|
||||||
handleFeatureClick(feature:Feature<Geometry>) {
|
handleFeatureClick(feature:Feature<Geometry>) {
|
||||||
if(feature) {
|
if(feature) {
|
||||||
this.store.dispatch(new mapActions.ClickFeature(feature));
|
|
||||||
const action = this.getAction(feature);
|
const action = this.getAction(feature);
|
||||||
this.store.dispatch(action);
|
this.store.dispatch(action);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { Directive, ViewContainerRef,TemplateRef,OnInit,Input, OnChanges } from '@angular/core';
|
import { Directive, ViewContainerRef,TemplateRef,OnInit,Input, OnChanges } from '@angular/core';
|
||||||
import { Layer } from 'ol/layer';
|
import { Layer } from 'ol/layer';
|
||||||
import { Source } from 'ol/source';
|
import { Source } from 'ol/source';
|
||||||
import { MapComponent } from '@farmmaps/ng-openlayers';
|
import { MapComponent } from 'ngx-openlayers';
|
||||||
|
|
||||||
@Directive({
|
@Directive({
|
||||||
selector: '[fmMapIfZoomToShow]',
|
selector: '[fmMapIfZoomToShow]',
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
.widget {
|
.widget {
|
||||||
padding:0.8rem;
|
padding:0.8rem;
|
||||||
height:100%;
|
height:100%;
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
.widget-container {
|
.widget-container {
|
||||||
overflow:auto;
|
overflow:auto;
|
||||||
margin-bottom:1rem;
|
margin-bottom:1rem;
|
||||||
@ -5,7 +7,7 @@
|
|||||||
|
|
||||||
.widget {
|
.widget {
|
||||||
position:relative;
|
position:relative;
|
||||||
border: 1px solid var(--bs-gray-500);
|
border: 1px solid $gray-500;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
display:inline-block;
|
display:inline-block;
|
||||||
width:50%;
|
width:50%;
|
||||||
@ -26,7 +28,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.widget:hover {
|
.widget:hover {
|
||||||
background-color: var(--bs-gray-100);
|
background-color: $gray-100;
|
||||||
}
|
}
|
||||||
|
|
||||||
.widget-container {
|
.widget-container {
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
.widget-container {
|
.widget-container {
|
||||||
overflow:auto;
|
overflow:auto;
|
||||||
margin-bottom:1rem;
|
margin-bottom:1rem;
|
||||||
@ -5,7 +7,7 @@
|
|||||||
|
|
||||||
.widget {
|
.widget {
|
||||||
position:relative;
|
position:relative;
|
||||||
border: 1px solid var(--bs-gray-500);
|
border: 1px solid $gray-500;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
display:inline-block;
|
display:inline-block;
|
||||||
width:50%;
|
width:50%;
|
||||||
@ -26,7 +28,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.widget:hover {
|
.widget:hover {
|
||||||
background-color: var(--bs-gray-100);
|
background-color: $gray-100;
|
||||||
}
|
}
|
||||||
|
|
||||||
.widget-container {
|
.widget-container {
|
||||||
|
|||||||
@ -1,15 +1,18 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
|
|
||||||
.layer-switcher {
|
.layer-switcher {
|
||||||
display:block;
|
display:block;
|
||||||
width:2.5em;
|
width:2.5em;
|
||||||
height:2.5em;
|
height:2.5em;
|
||||||
background-color: var(--bs-body-bg);
|
background-color: $body-bg;
|
||||||
background-size: contain;
|
background-size: contain;
|
||||||
margin-top:0.5em;
|
margin-top:0.5em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
line-height: 2.5em;
|
line-height: 2.5em;
|
||||||
border-radius: 1.75em;
|
border-radius: 1.75em;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
color: var(--bs-secondary);
|
color: $secondary;
|
||||||
}
|
}
|
||||||
|
|
||||||
.layer-switcher i {
|
.layer-switcher i {
|
||||||
@ -21,7 +24,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.layers {
|
.layers {
|
||||||
color:var(--bs-secondary);
|
color:$secondary;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
bottom: -1em;
|
bottom: -1em;
|
||||||
|
|||||||
@ -1,15 +1,15 @@
|
|||||||
<div class="row ps-3">
|
<div class="row ps-3">
|
||||||
<div class="col-8 nopadding"><span i18n>Average</span>:</div>
|
<div class="col-8 nopadding"><span i18n>Average</span>:</div>
|
||||||
<div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.mean)| number:'1.0-2'}}</div>
|
<div class="col-4 pull-left nopadding">{{histogram.mean| number:'1.0-2'}}</div>
|
||||||
<div class="col-8 nopadding"><span i18n>Standard deviation</span>:</div>
|
<div class="col-8 nopadding"><span i18n>Standard deviation</span>:</div>
|
||||||
<div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.stddev)| number:'1.0-2'}}</div>
|
<div class="col-4 pull-left nopadding">{{histogram.stddev| number:'1.0-2'}}</div>
|
||||||
<div class="col-8 nopadding"><span i18n>Min</span>:</div>
|
<div class="col-8 nopadding"><span i18n>Min</span>:</div>
|
||||||
<div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.min)| number:'1.0-2'}}</div>
|
<div class="col-4 pull-left nopadding">{{histogram.min| number:'1.0-2'}}</div>
|
||||||
<div class="col-8 nopadding" ><span i18n>Max</span>:</div>
|
<div class="col-8 nopadding" ><span i18n>Max</span>:</div>
|
||||||
<div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.max)| number:'1.0-2'}}</div>
|
<div class="col-4 pull-left nopadding">{{histogram.max| number:'1.0-2'}}</div>
|
||||||
|
|
||||||
<ng-container *ngIf="showConfidenceInterval()">
|
<ng-container *ngIf="showConfidenceInterval()">
|
||||||
<div class="col-8 nopadding"><span i18n>Confidence interval</span>:</div>
|
<div class="col-8 nopadding"><span i18n>Confidence interval</span>:</div>
|
||||||
<div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.confidence * 100)| number:'1.0-0'}}%</div>
|
<div class="col-4 pull-left nopadding">{{histogram.confidence * 100| number:'1.0-0'}}%</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -14,17 +14,6 @@ export class HistogramDetailsComponent {
|
|||||||
@Input()
|
@Input()
|
||||||
histogram: IHistogram;
|
histogram: IHistogram;
|
||||||
|
|
||||||
@Input()
|
|
||||||
scale: number | null;
|
|
||||||
|
|
||||||
public getScaledValue(value: number): number {
|
|
||||||
let v = value;
|
|
||||||
if (this.scale && this.scale != 0) {
|
|
||||||
v = this.scale * value;
|
|
||||||
}
|
|
||||||
return v;
|
|
||||||
}
|
|
||||||
|
|
||||||
showConfidenceInterval(): boolean {
|
showConfidenceInterval(): boolean {
|
||||||
return this.histogram.confidence != null && this.histogram.confidence !== 1;
|
return this.histogram.confidence != null && this.histogram.confidence !== 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,7 +35,7 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<ng-template #histogram>
|
<ng-template #histogram>
|
||||||
<fm-map-histogram-details [histogram]="layer.renderer.band.histogram" [scale]="layer.scale"></fm-map-histogram-details>
|
<fm-map-histogram-details [histogram]="layer.renderer.band.histogram"></fm-map-histogram-details>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
div.map-search {
|
div.map-search {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0.5rem;
|
top: 0.5rem;
|
||||||
@ -104,7 +106,7 @@ div.map-search.searchcollapsed button[type="submit"] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.form-control, .form-control:focus {
|
.form-control, .form-control:focus {
|
||||||
border-color: var(--bs-secondary);
|
border-color: $secondary;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,6 @@
|
|||||||
panelVisible:panelVisible$|async,
|
panelVisible:panelVisible$|async,
|
||||||
openedModalName:openedModalName$|async,
|
openedModalName:openedModalName$|async,
|
||||||
panelCollapsed:panelCollapsed$|async,
|
panelCollapsed:panelCollapsed$|async,
|
||||||
panelExtraWide:panelExtraWide$|async,
|
|
||||||
searchMinified:searchMinified$|async,
|
searchMinified:searchMinified$|async,
|
||||||
selectedItem:selectedItem$|async,
|
selectedItem:selectedItem$|async,
|
||||||
parentItem:parentItem$|async,
|
parentItem:parentItem$|async,
|
||||||
@ -65,7 +64,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="side-panel-container">
|
<div class="side-panel-container">
|
||||||
|
|
||||||
<fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false" [extrawide]="state.panelExtraWide">
|
<fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false">
|
||||||
<div class="panel-wrapper" *ngIf="noContent">
|
<div class="panel-wrapper" *ngIf="noContent">
|
||||||
<div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)">
|
<div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)">
|
||||||
</div>
|
</div>
|
||||||
@ -85,7 +84,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</fm-side-panel>
|
</fm-side-panel>
|
||||||
<fm-side-panel [resizeable]="true" [visible]="!noContent" [extrawide]="state.panelExtraWide">
|
<fm-side-panel [resizeable]="true" [visible]="!noContent">
|
||||||
<router-outlet (activate)="handleSidepaneloutletActivate($event)" (deactivate)="handleSidepaneloutletDeactivate($event)"></router-outlet>
|
<router-outlet (activate)="handleSidepaneloutletActivate($event)" (deactivate)="handleSidepaneloutletDeactivate($event)"></router-outlet>
|
||||||
</fm-side-panel>
|
</fm-side-panel>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
aol-map { position:absolute;width:100%;height:calc( 100vh );}
|
aol-map { position:absolute;width:100%;height:calc( 100vh );}
|
||||||
|
|
||||||
.arrow {
|
.arrow {
|
||||||
@ -193,7 +195,7 @@ timespan.menuVisible {
|
|||||||
width: 4rem;
|
width: 4rem;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
color: var(--bs-primary);
|
color: $primary;
|
||||||
}
|
}
|
||||||
|
|
||||||
.shortcut-icon > .farm-icon {
|
.shortcut-icon > .farm-icon {
|
||||||
|
|||||||
@ -66,7 +66,6 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
|
public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
|
||||||
public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
|
public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
|
||||||
public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
|
public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
|
||||||
public panelExtraWide$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelExtraWide);
|
|
||||||
public selectedFeature$: Observable<Feature<Geometry>> = this.store.select(mapReducers.selectGetSelectedFeature);
|
public selectedFeature$: Observable<Feature<Geometry>> = this.store.select(mapReducers.selectGetSelectedFeature);
|
||||||
public clickedFeature: Subject<Feature<Geometry>> = new Subject<Feature<Geometry>>();
|
public clickedFeature: Subject<Feature<Geometry>> = new Subject<Feature<Geometry>>();
|
||||||
public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
|
public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
|
||||||
@ -193,7 +192,6 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleFeatureClick(feature: Feature<Geometry>) {
|
handleFeatureClick(feature: Feature<Geometry>) {
|
||||||
this.store.dispatch(new mapActions.ClickFeature(feature));
|
|
||||||
this.clickedFeature.next(feature);
|
this.clickedFeature.next(feature);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -209,18 +207,12 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
if(component && component.hasOwnProperty('clickedFeature')) {
|
if(component && component.hasOwnProperty('clickedFeature')) {
|
||||||
(component as IClickedFeature).clickedFeature = this.clickedFeature;
|
(component as IClickedFeature).clickedFeature = this.clickedFeature;
|
||||||
}
|
}
|
||||||
if(component && component.hasOwnProperty('extrawide')) {
|
|
||||||
this.store.dispatch(new mapActions.SetPanelExtraWide(true));
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
handleSidepaneloutletDeactivate(component:any) {
|
handleSidepaneloutletDeactivate(component:any) {
|
||||||
if(component && component.hasOwnProperty('clickedFeature')) {
|
if(component && component.hasOwnProperty('clickedFeature')) {
|
||||||
(component as IClickedFeature).clickedFeature = null;
|
(component as IClickedFeature).clickedFeature = null;
|
||||||
}
|
}
|
||||||
if(component && component.hasOwnProperty('extrawide')) {
|
|
||||||
this.store.dispatch(new mapActions.SetPanelExtraWide(false));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
handlePrerender(event:any) {
|
handlePrerender(event:any) {
|
||||||
|
|||||||
@ -1,9 +1,13 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.row {
|
.row {
|
||||||
border-bottom: 1px solid var(--bs-gray-500);
|
border-bottom: 1px solid $gray-500;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.row:hover {
|
.row:hover {
|
||||||
background-color: var(--bs-gray-100);
|
background-color: $gray-100;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
.big-icon {
|
.big-icon {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
color: white;
|
color: white;
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
.big-icon {
|
.big-icon {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
color: white;
|
color: white;
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
.big-icon {
|
.big-icon {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
color: white;
|
color: white;
|
||||||
|
|||||||
@ -42,7 +42,6 @@
|
|||||||
<li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i> <span i18n>Remove overlay</span></a></li>
|
<li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i> <span i18n>Remove overlay</span></a></li>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i> <span i18n>Show chart</span></a></li>
|
<li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i> <span i18n>Show chart</span></a></li>
|
||||||
<li><a href="#" (click)="download(item,$event)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i> <span i18n>Download</span></a></li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
.big-icon {
|
.big-icon {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
color: white;
|
color: white;
|
||||||
|
|||||||
@ -2,7 +2,7 @@ import { Component, Injectable } from '@angular/core';
|
|||||||
import { Location } from '@angular/common';
|
import { Location } from '@angular/common';
|
||||||
import { Store } from '@ngrx/store';
|
import { Store } from '@ngrx/store';
|
||||||
import * as mapReducers from '../../reducers/map.reducer';
|
import * as mapReducers from '../../reducers/map.reducer';
|
||||||
import { commonReducers, ItemTypeService, IItem, ItemService, IItemLinkType, IUrlType } from '@farmmaps/common';
|
import { commonReducers, ItemTypeService, IItem } from '@farmmaps/common';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { ForItemType } from '../for-item/for-itemtype.decorator';
|
import { ForItemType } from '../for-item/for-itemtype.decorator';
|
||||||
import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
|
import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
|
||||||
@ -11,6 +11,7 @@ import * as mapActions from '../../actions/map.actions';
|
|||||||
import { IItemLayer } from '../../models/item.layer';
|
import { IItemLayer } from '../../models/item.layer';
|
||||||
import {TemporalService} from '../../services/temporal.service';
|
import {TemporalService} from '../../services/temporal.service';
|
||||||
|
|
||||||
|
|
||||||
@ForItemType("vnd.farmmaps.itemtype.temporal")
|
@ForItemType("vnd.farmmaps.itemtype.temporal")
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@Component({
|
@Component({
|
||||||
@ -20,7 +21,7 @@ import {TemporalService} from '../../services/temporal.service';
|
|||||||
})
|
})
|
||||||
export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {
|
export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {
|
||||||
|
|
||||||
constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
|
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
|
||||||
super(store, itemTypeService,location,router);
|
super(store, itemTypeService,location,router);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,15 +61,4 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
|
|||||||
this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
|
this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
download(item:IItem,event:MouseEvent) {
|
|
||||||
event.stopPropagation();
|
|
||||||
event.preventDefault();
|
|
||||||
const itemLink : IItemLinkType = {itemcode:item.code,pathsuffix:"download", validminutes:10}
|
|
||||||
console.log('download1', itemLink)
|
|
||||||
const foo = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {
|
|
||||||
console.log('download2', itemLinkUrl)
|
|
||||||
window.location.href =itemLinkUrl.url
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
.big-icon {
|
.big-icon {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
color: white;
|
color: white;
|
||||||
|
|||||||
@ -41,7 +41,7 @@ export const {
|
|||||||
selectRouteParam, // factory function to select a route param
|
selectRouteParam, // factory function to select a route param
|
||||||
selectRouteData, // select the current route data
|
selectRouteData, // select the current route data
|
||||||
selectUrl, // select the current url
|
selectUrl, // select the current url
|
||||||
} = fromRouter.getRouterSelectors(getRouterState);
|
} = fromRouter.getSelectors(getRouterState);
|
||||||
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@ -133,7 +133,7 @@ export class MapEffects {
|
|||||||
f.id = f.properties["code"];
|
f.id = f.properties["code"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return of(new mapActions.StartSearchSuccess(this._geojsonFormat.readFeatures(features).filter(feature => feature instanceof Feature) as Feature[], a.queryState));
|
return of(new mapActions.StartSearchSuccess(this._geojsonFormat.readFeatures(features), a.queryState));
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
catchError(error => of(new commonActions.Fail(error))));
|
catchError(error => of(new commonActions.Fail(error))));
|
||||||
@ -218,7 +218,7 @@ export class MapEffects {
|
|||||||
if (!this.overrideSelectedItemLayer) {
|
if (!this.overrideSelectedItemLayer) {
|
||||||
return this.itemService$.getFeature(action.item.code, "EPSG:3857").pipe(
|
return this.itemService$.getFeature(action.item.code, "EPSG:3857").pipe(
|
||||||
map((feature: any) => {
|
map((feature: any) => {
|
||||||
const f = this._geojsonFormat.readFeature(feature) as Feature;
|
const f = this._geojsonFormat.readFeature(feature);
|
||||||
f.setId(action.item.code);
|
f.setId(action.item.code);
|
||||||
return new mapActions.AddFeatureSuccess(f);
|
return new mapActions.AddFeatureSuccess(f);
|
||||||
}),
|
}),
|
||||||
|
|||||||
@ -49,7 +49,6 @@ export interface State {
|
|||||||
features: Array<Feature<Geometry>>,
|
features: Array<Feature<Geometry>>,
|
||||||
panelVisible: boolean,
|
panelVisible: boolean,
|
||||||
panelCollapsed: boolean,
|
panelCollapsed: boolean,
|
||||||
panelExtraWide: boolean,
|
|
||||||
selectedFeature: Feature<Geometry>,
|
selectedFeature: Feature<Geometry>,
|
||||||
selectedItem:IItem,
|
selectedItem:IItem,
|
||||||
parentItem:IItem,
|
parentItem:IItem,
|
||||||
@ -95,7 +94,6 @@ export const initialState: State = {
|
|||||||
features: [],
|
features: [],
|
||||||
panelVisible: false,
|
panelVisible: false,
|
||||||
panelCollapsed: false,
|
panelCollapsed: false,
|
||||||
panelExtraWide: false,
|
|
||||||
selectedFeature: null,
|
selectedFeature: null,
|
||||||
selectedItem: null,
|
selectedItem: null,
|
||||||
parentItem: null,
|
parentItem: null,
|
||||||
@ -390,9 +388,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
case mapActions.CLEARLAYERS: {
|
case mapActions.CLEARLAYERS: {
|
||||||
return tassign(state, {overlayLayers: [], selectedOverlayLayer: null});
|
return tassign(state, {overlayLayers: [], selectedOverlayLayer: null});
|
||||||
}
|
}
|
||||||
case mapActions.CLEARFEATURES: {
|
|
||||||
return tassign(state, {features: [], selectedFeature: null});
|
|
||||||
}
|
|
||||||
case mapActions.SETVISIBILITY: {
|
case mapActions.SETVISIBILITY: {
|
||||||
const a = action as mapActions.SetVisibility;
|
const a = action as mapActions.SetVisibility;
|
||||||
if(state.selectedItemLayer == a.itemLayer) {
|
if(state.selectedItemLayer == a.itemLayer) {
|
||||||
@ -574,10 +569,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
}
|
}
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
case mapActions.SETPANELEXTRAWIDE:{
|
|
||||||
const a= action as mapActions.SetPanelExtraWide;
|
|
||||||
return tassign(state,{panelExtraWide:a.panelExtraWide});
|
|
||||||
}
|
|
||||||
default: {
|
default: {
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
@ -589,7 +580,6 @@ export const getParentCode = (state: State) => state.parentCode;
|
|||||||
export const getFeatures = (state: State) => state.features;
|
export const getFeatures = (state: State) => state.features;
|
||||||
export const getPanelVisible = (state: State) => state.panelVisible;
|
export const getPanelVisible = (state: State) => state.panelVisible;
|
||||||
export const getPanelCollapsed = (state: State) => state.panelCollapsed;
|
export const getPanelCollapsed = (state: State) => state.panelCollapsed;
|
||||||
export const getPanelExtraWide = (state: State) => state.panelExtraWide;
|
|
||||||
export const getSelectedFeature = (state: State) => state.selectedFeature;
|
export const getSelectedFeature = (state: State) => state.selectedFeature;
|
||||||
export const getSelectedItem = (state: State) => state.selectedItem;
|
export const getSelectedItem = (state: State) => state.selectedItem;
|
||||||
export const getParentItem = (state: State) => state.parentItem;
|
export const getParentItem = (state: State) => state.parentItem;
|
||||||
@ -625,7 +615,6 @@ export const selectGetParentCode = createSelector(selectMapState, getParentCode)
|
|||||||
export const selectGetFeatures = createSelector(selectMapState, getFeatures);
|
export const selectGetFeatures = createSelector(selectMapState, getFeatures);
|
||||||
export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisible);
|
export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisible);
|
||||||
export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed);
|
export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed);
|
||||||
export const selectGetPanelExtraWide = createSelector(selectMapState, getPanelExtraWide);
|
|
||||||
export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature);
|
export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature);
|
||||||
export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem);
|
export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem);
|
||||||
export const selectGetParentItem = createSelector(selectMapState, getParentItem);
|
export const selectGetParentItem = createSelector(selectMapState, getParentItem);
|
||||||
|
|||||||
@ -9,6 +9,8 @@ import {
|
|||||||
platformBrowserDynamicTesting
|
platformBrowserDynamicTesting
|
||||||
} from '@angular/platform-browser-dynamic/testing';
|
} from '@angular/platform-browser-dynamic/testing';
|
||||||
|
|
||||||
|
declare const require: any;
|
||||||
|
|
||||||
// First, initialize the Angular testing environment.
|
// First, initialize the Angular testing environment.
|
||||||
getTestBed().initTestEnvironment(
|
getTestBed().initTestEnvironment(
|
||||||
BrowserDynamicTestingModule,
|
BrowserDynamicTestingModule,
|
||||||
@ -16,3 +18,7 @@ getTestBed().initTestEnvironment(
|
|||||||
teardown: { destroyAfterEach: false }
|
teardown: { destroyAfterEach: false }
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
// Then we find all the tests.
|
||||||
|
const context = require.context('./', true, /\.spec\.ts$/);
|
||||||
|
// And load the modules.
|
||||||
|
context.keys().map(context);
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
"extends": "../../tsconfig.json",
|
"extends": "../../tsconfig.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"outDir": "../../out-tsc/lib",
|
"outDir": "../../out-tsc/lib",
|
||||||
|
"target": "es2020",
|
||||||
"module": "es2015",
|
"module": "es2015",
|
||||||
"moduleResolution": "node",
|
"moduleResolution": "node",
|
||||||
"declaration": true,
|
"declaration": true,
|
||||||
@ -10,27 +11,18 @@
|
|||||||
"emitDecoratorMetadata": true,
|
"emitDecoratorMetadata": true,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
"importHelpers": true,
|
"importHelpers": true,
|
||||||
"esModuleInterop": true,
|
|
||||||
"types": [],
|
"types": [],
|
||||||
"lib": [
|
"lib": [
|
||||||
"dom",
|
"dom",
|
||||||
"es2018"
|
"es2018"
|
||||||
],
|
]
|
||||||
"paths": {
|
|
||||||
"@angular/*": [
|
|
||||||
|
|
||||||
"node_modules/@angular/*"
|
|
||||||
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"angularCompilerOptions": {
|
"angularCompilerOptions": {
|
||||||
"skipTemplateCodegen": true,
|
"skipTemplateCodegen": true,
|
||||||
"strictMetadataEmit": true,
|
"strictMetadataEmit": true,
|
||||||
"fullTemplateTypeCheck": true,
|
"fullTemplateTypeCheck": true,
|
||||||
"strictInjectionParameters": true,
|
"strictInjectionParameters": true,
|
||||||
"enableResourceInlining": true,
|
"enableResourceInlining": true
|
||||||
"compilationMode": "partial"
|
|
||||||
},
|
},
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"src/test.ts",
|
"src/test.ts",
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
"extends": "../../tsconfig.json",
|
"extends": "../../tsconfig.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"outDir": "../../out-tsc/lib",
|
"outDir": "../../out-tsc/lib",
|
||||||
|
"target": "es2020",
|
||||||
"module": "es2015",
|
"module": "es2015",
|
||||||
"moduleResolution": "node",
|
"moduleResolution": "node",
|
||||||
"declaration": true,
|
"declaration": true,
|
||||||
|
|||||||
546
projects/common-map3d/package-lock.json
generated
546
projects/common-map3d/package-lock.json
generated
@ -11,555 +11,17 @@
|
|||||||
"tslib": "^2.0.0"
|
"tslib": "^2.0.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@angular/common": "^18.2.3",
|
"@angular/common": ">=14.0.0",
|
||||||
"@angular/core": "^18.2.3",
|
"@angular/core": ">=14.0.0",
|
||||||
"cesium": "^1.97.0",
|
"cesium": ">=1.82.1",
|
||||||
|
"ngx-openlayers": "1.0.0-next.19",
|
||||||
"ol-cesium": ">=2.13.0"
|
"ol-cesium": ">=2.13.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"../../dist/libs/ng-openlayers": {
|
|
||||||
"version": "18.0.0",
|
|
||||||
"extraneous": true,
|
|
||||||
"license": "MPL-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@angular/common": "^18.2.3",
|
|
||||||
"@angular/core": "^18.2.3",
|
|
||||||
"ol": "^8.2.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"dist/ng-openlayers": {
|
|
||||||
"extraneous": true
|
|
||||||
},
|
|
||||||
"node_modules/@angular/common": {
|
|
||||||
"version": "18.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.3.tgz",
|
|
||||||
"integrity": "sha512-NFL4yXXImSCH7i1xnHykUjHa9vl9827fGiwSV2mnf7LjSUsyDzFD8/54dNuYN9OY8AUD+PnK0YdNro6cczVyIA==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@angular/core": "18.2.3",
|
|
||||||
"rxjs": "^6.5.3 || ^7.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@angular/core": {
|
|
||||||
"version": "18.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.3.tgz",
|
|
||||||
"integrity": "sha512-VGhMJxj7d0rYpqVfQrcGRB7EE/BCziotft/I/YPl6bOMPSAvMukG7DXQuJdYpNrr62ks78mlzHlZX/cdmB9Prw==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"rxjs": "^6.5.3 || ^7.4.0",
|
|
||||||
"zone.js": "~0.14.10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@cesium/engine": {
|
|
||||||
"version": "11.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@cesium/engine/-/engine-11.0.0.tgz",
|
|
||||||
"integrity": "sha512-0z3mJNNly407h3/bAvGoGnjA0ygprkVz32z9x1VNmPXf9AuybKu7Q4wRrChUhC/qsNj3L45kP6KqyDuHSe2bhw==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@tweenjs/tween.js": "^25.0.0",
|
|
||||||
"@zip.js/zip.js": "^2.7.34",
|
|
||||||
"autolinker": "^4.0.0",
|
|
||||||
"bitmap-sdf": "^1.0.3",
|
|
||||||
"dompurify": "^3.0.2",
|
|
||||||
"draco3d": "^1.5.1",
|
|
||||||
"earcut": "^3.0.0",
|
|
||||||
"grapheme-splitter": "^1.0.4",
|
|
||||||
"jsep": "^1.3.8",
|
|
||||||
"kdbush": "^4.0.1",
|
|
||||||
"ktx-parse": "^0.7.0",
|
|
||||||
"lerc": "^2.0.0",
|
|
||||||
"mersenne-twister": "^1.1.0",
|
|
||||||
"meshoptimizer": "^0.21.0",
|
|
||||||
"pako": "^2.0.4",
|
|
||||||
"protobufjs": "^7.1.0",
|
|
||||||
"rbush": "^4.0.0",
|
|
||||||
"topojson-client": "^3.1.0",
|
|
||||||
"urijs": "^1.19.7"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=14.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@cesium/widgets": {
|
|
||||||
"version": "8.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@cesium/widgets/-/widgets-8.0.0.tgz",
|
|
||||||
"integrity": "sha512-Rnid5BbLBZjwFdbr3lgOwK3fhql/BeEbf5l9ZZE+Zc7V8Fb6wgKM8QmrL+bbJ+BtuiELp+SkNxcF97Ktifxb4g==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@cesium/engine": "^11.0.0",
|
|
||||||
"nosleep.js": "^0.12.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=14.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@petamoriken/float16": {
|
|
||||||
"version": "3.8.7",
|
|
||||||
"resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.8.7.tgz",
|
|
||||||
"integrity": "sha512-/Ri4xDDpe12NT6Ex/DRgHzLlobiQXEW/hmG08w1wj/YU7hLemk97c+zHQFp0iZQ9r7YqgLEXZR2sls4HxBf9NA==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/aspromise": {
|
|
||||||
"version": "1.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
|
|
||||||
"integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/base64": {
|
|
||||||
"version": "1.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
|
|
||||||
"integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/codegen": {
|
|
||||||
"version": "2.0.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
|
|
||||||
"integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/eventemitter": {
|
|
||||||
"version": "1.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
|
|
||||||
"integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/fetch": {
|
|
||||||
"version": "1.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
|
|
||||||
"integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@protobufjs/aspromise": "^1.1.1",
|
|
||||||
"@protobufjs/inquire": "^1.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/float": {
|
|
||||||
"version": "1.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
|
|
||||||
"integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/inquire": {
|
|
||||||
"version": "1.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
|
|
||||||
"integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/path": {
|
|
||||||
"version": "1.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
|
|
||||||
"integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/pool": {
|
|
||||||
"version": "1.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
|
|
||||||
"integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/utf8": {
|
|
||||||
"version": "1.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
|
|
||||||
"integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@tweenjs/tween.js": {
|
|
||||||
"version": "25.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-25.0.0.tgz",
|
|
||||||
"integrity": "sha512-XKLA6syeBUaPzx4j3qwMqzzq+V4uo72BnlbOjmuljLrRqdsd3qnzvZZoxvMHZ23ndsRS4aufU6JOZYpCbU6T1A==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@types/node": {
|
|
||||||
"version": "22.5.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
|
|
||||||
"integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"undici-types": "~6.19.2"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@types/rbush": {
|
|
||||||
"version": "3.0.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/rbush/-/rbush-3.0.4.tgz",
|
|
||||||
"integrity": "sha512-knSt9cCW8jj1ZSFcFeBZaX++OucmfPxxHiRwTahZfJlnQsek7O0bazTJHWD2RVj9LEoejUYF2de3/stf+QXcXw==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/@zip.js/zip.js": {
|
|
||||||
"version": "2.7.52",
|
|
||||||
"resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.52.tgz",
|
|
||||||
"integrity": "sha512-+5g7FQswvrCHwYKNMd/KFxZSObctLSsQOgqBSi0LzwHo3li9Eh1w5cF5ndjQw9Zbr3ajVnd2+XyiX85gAetx1Q==",
|
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
|
||||||
"bun": ">=0.7.0",
|
|
||||||
"deno": ">=1.0.0",
|
|
||||||
"node": ">=16.5.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/autolinker": {
|
|
||||||
"version": "4.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/autolinker/-/autolinker-4.0.0.tgz",
|
|
||||||
"integrity": "sha512-fl5Kh6BmEEZx+IWBfEirnRUU5+cOiV0OK7PEt0RBKvJMJ8GaRseIOeDU3FKf4j3CE5HVefcjHmhYPOcaVt0bZw==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.3.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/bitmap-sdf": {
|
|
||||||
"version": "1.0.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/bitmap-sdf/-/bitmap-sdf-1.0.4.tgz",
|
|
||||||
"integrity": "sha512-1G3U4n5JE6RAiALMxu0p1XmeZkTeCwGKykzsLTCqVzfSDaN6S7fKnkIkfejogz+iwqBWc0UYAIKnKHNN7pSfDg==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/cesium": {
|
|
||||||
"version": "1.121.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/cesium/-/cesium-1.121.1.tgz",
|
|
||||||
"integrity": "sha512-WpdaGFd8qCOHiE9khV0sWWjCMXAX1U9Aou8MzMC/F0Akp6YqcOk4HLk4LLhZKeOjO/Bh27iTIW2mxEZ5+dtCxg==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@cesium/engine": "^11.0.0",
|
|
||||||
"@cesium/widgets": "^8.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18.18.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/color-name": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.0.tgz",
|
|
||||||
"integrity": "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==",
|
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12.20"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/color-parse": {
|
|
||||||
"version": "2.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/color-parse/-/color-parse-2.0.2.tgz",
|
|
||||||
"integrity": "sha512-eCtOz5w5ttWIUcaKLiktF+DxZO1R9KLNY/xhbV6CkhM7sR3GhVghmt6X6yOnzeaM24po+Z9/S1apbXMwA3Iepw==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"color-name": "^2.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/color-rgba": {
|
|
||||||
"version": "3.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/color-rgba/-/color-rgba-3.0.0.tgz",
|
|
||||||
"integrity": "sha512-PPwZYkEY3M2THEHHV6Y95sGUie77S7X8v+h1r6LSAPF3/LL2xJ8duUXSrkic31Nzc4odPwHgUbiX/XuTYzQHQg==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"color-parse": "^2.0.0",
|
|
||||||
"color-space": "^2.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/color-space": {
|
|
||||||
"version": "2.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/color-space/-/color-space-2.0.1.tgz",
|
|
||||||
"integrity": "sha512-nKqUYlo0vZATVOFHY810BSYjmCARrG7e5R3UE3CQlyjJTvv5kSSmPG1kzm/oDyyqjehM+lW1RnEt9It9GNa5JA==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/commander": {
|
|
||||||
"version": "2.20.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
|
|
||||||
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/dompurify": {
|
|
||||||
"version": "3.1.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz",
|
|
||||||
"integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/draco3d": {
|
|
||||||
"version": "1.5.7",
|
|
||||||
"resolved": "https://registry.npmjs.org/draco3d/-/draco3d-1.5.7.tgz",
|
|
||||||
"integrity": "sha512-m6WCKt/erDXcw+70IJXnG7M3awwQPAsZvJGX5zY7beBqpELw6RDGkYVU0W43AFxye4pDZ5i2Lbyc/NNGqwjUVQ==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/earcut": {
|
|
||||||
"version": "3.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/earcut/-/earcut-3.0.0.tgz",
|
|
||||||
"integrity": "sha512-41Fs7Q/PLq1SDbqjsgcY7GA42T0jvaCNGXgGtsNdvg+Yv8eIu06bxv4/PoREkZ9nMDNwnUSG9OFB9+yv8eKhDg==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/geotiff": {
|
|
||||||
"version": "2.1.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/geotiff/-/geotiff-2.1.3.tgz",
|
|
||||||
"integrity": "sha512-PT6uoF5a1+kbC3tHmZSUsLHBp2QJlHasxxxxPW47QIY1VBKpFB+FcDvX+MxER6UzgLQZ0xDzJ9s48B9JbOCTqA==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@petamoriken/float16": "^3.4.7",
|
|
||||||
"lerc": "^3.0.0",
|
|
||||||
"pako": "^2.0.4",
|
|
||||||
"parse-headers": "^2.0.2",
|
|
||||||
"quick-lru": "^6.1.1",
|
|
||||||
"web-worker": "^1.2.0",
|
|
||||||
"xml-utils": "^1.0.2",
|
|
||||||
"zstddec": "^0.1.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10.19"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/geotiff/node_modules/lerc": {
|
|
||||||
"version": "3.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/lerc/-/lerc-3.0.0.tgz",
|
|
||||||
"integrity": "sha512-Rm4J/WaHhRa93nCN2mwWDZFoRVF18G1f47C+kvQWyHGEZxFpTUi73p7lMVSAndyxGt6lJ2/CFbOcf9ra5p8aww==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/grapheme-splitter": {
|
|
||||||
"version": "1.0.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
|
|
||||||
"integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/jsep": {
|
|
||||||
"version": "1.3.9",
|
|
||||||
"resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.9.tgz",
|
|
||||||
"integrity": "sha512-i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw==",
|
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 10.16.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/kdbush": {
|
|
||||||
"version": "4.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
|
|
||||||
"integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/ktx-parse": {
|
|
||||||
"version": "0.7.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/ktx-parse/-/ktx-parse-0.7.1.tgz",
|
|
||||||
"integrity": "sha512-FeA3g56ksdFNwjXJJsc1CCc7co+AJYDp6ipIp878zZ2bU8kWROatLYf39TQEd4/XRSUvBXovQ8gaVKWPXsCLEQ==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/lerc": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/lerc/-/lerc-2.0.0.tgz",
|
|
||||||
"integrity": "sha512-7qo1Mq8ZNmaR4USHHm615nEW2lPeeWJ3bTyoqFbd35DLx0LUH7C6ptt5FDCTAlbIzs3+WKrk5SkJvw8AFDE2hg==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/long": {
|
|
||||||
"version": "5.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
|
|
||||||
"integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/mersenne-twister": {
|
|
||||||
"version": "1.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/mersenne-twister/-/mersenne-twister-1.1.0.tgz",
|
|
||||||
"integrity": "sha512-mUYWsMKNrm4lfygPkL3OfGzOPTR2DBlTkBNHM//F6hGp8cLThY897crAlk3/Jo17LEOOjQUrNAx6DvgO77QJkA==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/meshoptimizer": {
|
|
||||||
"version": "0.21.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/meshoptimizer/-/meshoptimizer-0.21.0.tgz",
|
|
||||||
"integrity": "sha512-WabtlpnK/GgD0GMwYd1fBTfYHf4MIcQPEg6dt7y4GuDcY51RzLSkSNE8ZogD7U3Vs2/fIf4z89TOLpA80EOnhg==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/nosleep.js": {
|
|
||||||
"version": "0.12.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.12.0.tgz",
|
|
||||||
"integrity": "sha512-9d1HbpKLh3sdWlhXMhU6MMH+wQzKkrgfRkYV0EBdvt99YJfj0ilCJrWRDYG2130Tm4GXbEoTCx5b34JSaP+HhA==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/ol": {
|
|
||||||
"version": "10.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ol/-/ol-10.1.0.tgz",
|
|
||||||
"integrity": "sha512-/efepydpzhFoeczA9KAN5t7G0WpFhP46ZXEfSl6JbZ7ipQZ2axpkYB2qt0qcOUlPFYMt7/XQFApH652KB08tTg==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@types/rbush": "^3.0.3",
|
|
||||||
"color-rgba": "^3.0.0",
|
|
||||||
"color-space": "^2.0.1",
|
|
||||||
"earcut": "^3.0.0",
|
|
||||||
"geotiff": "^2.0.7",
|
|
||||||
"pbf": "4.0.1",
|
|
||||||
"rbush": "^4.0.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/openlayers"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/ol-cesium": {
|
|
||||||
"version": "2.17.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ol-cesium/-/ol-cesium-2.17.0.tgz",
|
|
||||||
"integrity": "sha512-XaMXjQYuq2eMPAgAx2e1wjN4I4QwfmPC+9YgU4xoMCj/MBj8oDQusyloQ4TaovypqbZg+0jJDDSZc7BhXckBwA==",
|
|
||||||
"peer": true,
|
|
||||||
"peerDependencies": {
|
|
||||||
"cesium": ">= 1.62.0",
|
|
||||||
"ol": ">= 6.0.1 || 7 || 8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/pako": {
|
|
||||||
"version": "2.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
|
|
||||||
"integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/parse-headers": {
|
|
||||||
"version": "2.0.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.5.tgz",
|
|
||||||
"integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/pbf": {
|
|
||||||
"version": "4.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/pbf/-/pbf-4.0.1.tgz",
|
|
||||||
"integrity": "sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"resolve-protobuf-schema": "^2.1.0"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"pbf": "bin/pbf"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/protobufjs": {
|
|
||||||
"version": "7.4.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
|
|
||||||
"integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
|
|
||||||
"hasInstallScript": true,
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@protobufjs/aspromise": "^1.1.2",
|
|
||||||
"@protobufjs/base64": "^1.1.2",
|
|
||||||
"@protobufjs/codegen": "^2.0.4",
|
|
||||||
"@protobufjs/eventemitter": "^1.1.0",
|
|
||||||
"@protobufjs/fetch": "^1.1.0",
|
|
||||||
"@protobufjs/float": "^1.0.2",
|
|
||||||
"@protobufjs/inquire": "^1.1.0",
|
|
||||||
"@protobufjs/path": "^1.1.2",
|
|
||||||
"@protobufjs/pool": "^1.1.0",
|
|
||||||
"@protobufjs/utf8": "^1.1.0",
|
|
||||||
"@types/node": ">=13.7.0",
|
|
||||||
"long": "^5.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/protocol-buffers-schema": {
|
|
||||||
"version": "3.6.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
|
|
||||||
"integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/quick-lru": {
|
|
||||||
"version": "6.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-6.1.2.tgz",
|
|
||||||
"integrity": "sha512-AAFUA5O1d83pIHEhJwWCq/RQcRukCkn/NSm2QsTEMle5f2hP0ChI2+3Xb051PZCkLryI/Ir1MVKviT2FIloaTQ==",
|
|
||||||
"peer": true,
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/quickselect": {
|
|
||||||
"version": "3.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/quickselect/-/quickselect-3.0.0.tgz",
|
|
||||||
"integrity": "sha512-XdjUArbK4Bm5fLLvlm5KpTFOiOThgfWWI4axAZDWg4E/0mKdZyI9tNEfds27qCi1ze/vwTR16kvmmGhRra3c2g==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/rbush": {
|
|
||||||
"version": "4.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/rbush/-/rbush-4.0.1.tgz",
|
|
||||||
"integrity": "sha512-IP0UpfeWQujYC8Jg162rMNc01Rf0gWMMAb2Uxus/Q0qOFw4lCcq6ZnQEZwUoJqWyUGJ9th7JjwI4yIWo+uvoAQ==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"quickselect": "^3.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/resolve-protobuf-schema": {
|
|
||||||
"version": "2.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
|
|
||||||
"integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"protocol-buffers-schema": "^3.3.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/rxjs": {
|
|
||||||
"version": "7.8.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
|
|
||||||
"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/topojson-client": {
|
|
||||||
"version": "3.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz",
|
|
||||||
"integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==",
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"commander": "2"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"topo2geo": "bin/topo2geo",
|
|
||||||
"topomerge": "bin/topomerge",
|
|
||||||
"topoquantize": "bin/topoquantize"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/tslib": {
|
"node_modules/tslib": {
|
||||||
"version": "2.5.0",
|
"version": "2.5.0",
|
||||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
|
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
|
||||||
"integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
|
"integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
|
||||||
},
|
|
||||||
"node_modules/undici-types": {
|
|
||||||
"version": "6.19.8",
|
|
||||||
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
|
|
||||||
"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/urijs": {
|
|
||||||
"version": "1.19.11",
|
|
||||||
"resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz",
|
|
||||||
"integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/web-worker": {
|
|
||||||
"version": "1.3.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.3.0.tgz",
|
|
||||||
"integrity": "sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/xml-utils": {
|
|
||||||
"version": "1.10.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/xml-utils/-/xml-utils-1.10.1.tgz",
|
|
||||||
"integrity": "sha512-Dn6vJ1Z9v1tepSjvnCpwk5QqwIPcEFKdgnjqfYOABv1ngSofuAhtlugcUC3ehS1OHdgDWSG6C5mvj+Qm15udTQ==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/zone.js": {
|
|
||||||
"version": "0.14.10",
|
|
||||||
"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz",
|
|
||||||
"integrity": "sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==",
|
|
||||||
"peer": true
|
|
||||||
},
|
|
||||||
"node_modules/zstddec": {
|
|
||||||
"version": "0.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.1.0.tgz",
|
|
||||||
"integrity": "sha512-w2NTI8+3l3eeltKAdK8QpiLo/flRAr2p8AGeakfMZOXBxOg9HIu4LVDxBi81sYgVhFhdJjv1OrB5ssI8uFPoLg==",
|
|
||||||
"peer": true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,13 +4,14 @@
|
|||||||
"publishConfig": {
|
"publishConfig": {
|
||||||
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
|
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
|
||||||
},
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"@angular/common": ">=14.0.0",
|
||||||
|
"@angular/core": ">=14.0.0",
|
||||||
|
"ngx-openlayers": "1.0.0-next.19",
|
||||||
|
"cesium": ">=1.82.1",
|
||||||
|
"ol-cesium": ">=2.13.0"
|
||||||
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tslib": "^2.0.0"
|
"tslib": "^2.0.0"
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@angular/common": "18.2.3",
|
|
||||||
"@angular/core": "18.2.3",
|
|
||||||
"cesium": "^1.97.0",
|
|
||||||
"ol-cesium": ">=2.13.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,15 +1,14 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { AppCommonModule } from '@farmmaps/common';
|
|
||||||
import { AppCommonMapModule } from '@farmmaps/common-map';
|
|
||||||
import { AngularOpenlayersModule } from '@farmmaps/ng-openlayers';
|
|
||||||
import { Switch2D3DComponent } from './components/olcs/switch2d3d/switch2d3d.component';
|
import { Switch2D3DComponent } from './components/olcs/switch2d3d/switch2d3d.component';
|
||||||
|
import { AppCommonModule} from '@farmmaps/common';
|
||||||
|
import { AppCommonMapModule} from '@farmmaps/common-map';
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [Switch2D3DComponent],
|
declarations: [Switch2D3DComponent],
|
||||||
imports: [
|
imports: [
|
||||||
AppCommonModule,
|
AppCommonModule,
|
||||||
AppCommonMapModule,
|
AppCommonMapModule
|
||||||
AngularOpenlayersModule,
|
|
||||||
],
|
],
|
||||||
exports: [Switch2D3DComponent]
|
exports: [Switch2D3DComponent]
|
||||||
})
|
})
|
||||||
|
|||||||
@ -1,15 +1,17 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
.twotreed {
|
.twotreed {
|
||||||
display:block;
|
display:block;
|
||||||
width:2.5em;
|
width:2.5em;
|
||||||
height:2.5em;
|
height:2.5em;
|
||||||
background-color: var(--bs-body-bg);
|
background-color: $body-bg;
|
||||||
background-size: contain;
|
background-size: contain;
|
||||||
margin-top:0.5em;
|
margin-top:0.5em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
line-height: 2.5em;
|
line-height: 2.5em;
|
||||||
border-radius: 1.75em;
|
border-radius: 1.75em;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
color: var(--bs-secondary);
|
color: $secondary;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fa-spinner {
|
.fa-spinner {
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { Component, OnInit,Input,Host } from '@angular/core';
|
import { Component, OnInit,Input,Host } from '@angular/core';
|
||||||
import { Interaction} from 'ol/interaction';
|
import { Interaction} from 'ol/interaction';
|
||||||
import { MapComponent } from '@farmmaps/ng-openlayers';
|
import { MapComponent } from 'ngx-openlayers';
|
||||||
import OLCesium from 'olcs/OLCesium';
|
import OLCesium from 'olcs/OLCesium';
|
||||||
import RasterSynchronizer from 'olcs/RasterSynchronizer';
|
import RasterSynchronizer from 'olcs/RasterSynchronizer';
|
||||||
import VectorSynchronizer from 'olcs/VectorSynchronizer';
|
import VectorSynchronizer from 'olcs/VectorSynchronizer';
|
||||||
@ -49,11 +49,7 @@ export class Switch2D3DComponent {
|
|||||||
this.interactions=[];
|
this.interactions=[];
|
||||||
this.map.instance.getInteractions().forEach((i) => {
|
this.map.instance.getInteractions().forEach((i) => {
|
||||||
if(i.getActive()) {
|
if(i.getActive()) {
|
||||||
// AW-6241 TODO How to fix?
|
this.interactions.push(i);
|
||||||
// error TS2345: Argument of type 'import("C:/Project/Farmmaps/FarmMapsLib/node_modules/ol/interaction/Interaction").default'
|
|
||||||
// is not assignable to parameter of type 'import("C:/Project/Farmmaps/FarmMapsLib/projects/common-map3d/node_modules/ol/interaction/Interaction").default'.
|
|
||||||
// Line below commented out
|
|
||||||
// this.interactions.push(i);
|
|
||||||
i.setActive(false);
|
i.setActive(false);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -8,6 +8,13 @@ import {
|
|||||||
platformBrowserDynamicTesting
|
platformBrowserDynamicTesting
|
||||||
} from '@angular/platform-browser-dynamic/testing';
|
} from '@angular/platform-browser-dynamic/testing';
|
||||||
|
|
||||||
|
declare const require: {
|
||||||
|
context(path: string, deep?: boolean, filter?: RegExp): {
|
||||||
|
keys(): string[];
|
||||||
|
<T>(id: string): T;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
// First, initialize the Angular testing environment.
|
// First, initialize the Angular testing environment.
|
||||||
getTestBed().initTestEnvironment(
|
getTestBed().initTestEnvironment(
|
||||||
BrowserDynamicTestingModule,
|
BrowserDynamicTestingModule,
|
||||||
@ -15,3 +22,7 @@ getTestBed().initTestEnvironment(
|
|||||||
teardown: { destroyAfterEach: false }
|
teardown: { destroyAfterEach: false }
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
// Then we find all the tests.
|
||||||
|
const context = require.context('./', true, /\.spec\.ts$/);
|
||||||
|
// And load the modules.
|
||||||
|
context.keys().map(context);
|
||||||
|
|||||||
@ -11,27 +11,18 @@
|
|||||||
"emitDecoratorMetadata": true,
|
"emitDecoratorMetadata": true,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
"importHelpers": true,
|
"importHelpers": true,
|
||||||
"esModuleInterop": true,
|
|
||||||
"types": [],
|
"types": [],
|
||||||
"lib": [
|
"lib": [
|
||||||
"dom",
|
"dom",
|
||||||
"es2018"
|
"es2018"
|
||||||
],
|
]
|
||||||
"paths": {
|
|
||||||
"@angular/*": [
|
|
||||||
|
|
||||||
"node_modules/@angular/*"
|
|
||||||
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"angularCompilerOptions": {
|
"angularCompilerOptions": {
|
||||||
"skipTemplateCodegen": true,
|
"skipTemplateCodegen": true,
|
||||||
"strictMetadataEmit": true,
|
"strictMetadataEmit": true,
|
||||||
"fullTemplateTypeCheck": true,
|
"fullTemplateTypeCheck": true,
|
||||||
"strictInjectionParameters": true,
|
"strictInjectionParameters": true,
|
||||||
"enableResourceInlining": true,
|
"enableResourceInlining": true
|
||||||
"compilationMode": "partial"
|
|
||||||
},
|
},
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"src/test.ts",
|
"src/test.ts",
|
||||||
|
|||||||
3755
projects/common/package-lock.json
generated
3755
projects/common/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,25 +1,25 @@
|
|||||||
{
|
{
|
||||||
"name": "@farmmaps/common",
|
"name": "@farmmaps/common",
|
||||||
"version": "2.1.0",
|
"version": "2.0.0",
|
||||||
"publishConfig": {
|
"publishConfig": {
|
||||||
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
|
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@ng-bootstrap/ng-bootstrap": "^17.0.1",
|
"@ng-bootstrap/ng-bootstrap": ">=10.0.0",
|
||||||
"@angular/common": "18.2.3",
|
"@angular/common": ">=14.0.0",
|
||||||
"@angular/core": "18.2.3",
|
"@angular/core": ">=14.0.0",
|
||||||
"@angular/forms": "18.2.3",
|
"@angular/forms": ">=14.0.0",
|
||||||
"@ngrx/effects": "^18.0.2",
|
"@ngrx/effects": ">=14.0.0",
|
||||||
"@ngrx/router-store": "^18.0.2",
|
"@ngrx/router-store": ">=14.0.0",
|
||||||
"@ngrx/store": "^18.0.2",
|
"@ngrx/store": ">=14.0.0",
|
||||||
"tassign": "^1.0.0",
|
"tassign": ">=1.0.0",
|
||||||
"bootstrap": "^5.3.3",
|
"bootstrap": ">=4.4.1",
|
||||||
"@microsoft/signalr": "^3.1.16",
|
"@microsoft/signalr": ">=3.1.3",
|
||||||
"ngx-uploadx": "^6.2.0",
|
"ngx-uploadx": ">=5.1.0",
|
||||||
"angular-oauth2-oidc": "^17.0.2",
|
"angular-oauth2-oidc": ">=13.0.0",
|
||||||
"moment": "^2.29.4",
|
"moment": ">=2.27.0",
|
||||||
"ngx-avatars": "^1.8.0",
|
"ngx-avatar": ">=4.1.0",
|
||||||
"ngx-image-cropper": "^7.0.0",
|
"ngx-image-cropper": ">=3.3.5",
|
||||||
"ngx-clipboard": "^16.0.0"
|
"ngx-clipboard": ">=14.0.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -71,8 +71,6 @@ export const TOGGLENOTIFICATIONMENU = '[AppCommon] ToggleNotificationMenu';
|
|||||||
|
|
||||||
export const TOGGLEHELPMENU = '[AppCommon] ToggleHelpMenu';
|
export const TOGGLEHELPMENU = '[AppCommon] ToggleHelpMenu';
|
||||||
|
|
||||||
export const TOGGLESETTINGMENU = '[AppCommon] ToggleSettingMenu';
|
|
||||||
|
|
||||||
export const SETMENUVISIBLE = '[AppCommon] SetMenuVisible';
|
export const SETMENUVISIBLE = '[AppCommon] SetMenuVisible';
|
||||||
|
|
||||||
export const ONLINE = '[AppCommon] Online';
|
export const ONLINE = '[AppCommon] Online';
|
||||||
@ -83,11 +81,6 @@ export const SETPAGEMODE = '[AppCommon] SetPageMode';
|
|||||||
|
|
||||||
export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications';
|
export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications';
|
||||||
|
|
||||||
export const SWITCHLANGUAGE = '[AppCommon] SwitchLanguage';
|
|
||||||
|
|
||||||
export const SETSETTINGMENUBACKGROUNDCOLOR = '[AppCommon] SetSettingMenuBackgroundColor';
|
|
||||||
|
|
||||||
|
|
||||||
export class InitUser implements Action {
|
export class InitUser implements Action {
|
||||||
readonly type = INITUSER;
|
readonly type = INITUSER;
|
||||||
|
|
||||||
@ -339,12 +332,6 @@ export class ToggleHelpMenu implements Action {
|
|||||||
constructor() { }
|
constructor() { }
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ToggleSettingMenu implements Action {
|
|
||||||
readonly type = TOGGLESETTINGMENU;
|
|
||||||
|
|
||||||
constructor() { }
|
|
||||||
}
|
|
||||||
|
|
||||||
export class SetMenuVisible implements Action {
|
export class SetMenuVisible implements Action {
|
||||||
readonly type = SETMENUVISIBLE;
|
readonly type = SETMENUVISIBLE;
|
||||||
|
|
||||||
@ -376,17 +363,6 @@ export class SetUnreadNotifications implements Action {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SwitchLanguage implements Action {
|
|
||||||
readonly type = SWITCHLANGUAGE;
|
|
||||||
|
|
||||||
constructor(public locale:string) { }
|
|
||||||
}
|
|
||||||
|
|
||||||
export class SetSettingMenuBackgroundColor implements Action {
|
|
||||||
readonly type = SETSETTINGMENUBACKGROUNDCOLOR;
|
|
||||||
|
|
||||||
constructor(public color:string) { }
|
|
||||||
}
|
|
||||||
|
|
||||||
export type Actions = OpenModal
|
export type Actions = OpenModal
|
||||||
| InitRoot
|
| InitRoot
|
||||||
@ -432,10 +408,7 @@ export type Actions = OpenModal
|
|||||||
| ToggleAppMenu
|
| ToggleAppMenu
|
||||||
| ToggleNotificationMenu
|
| ToggleNotificationMenu
|
||||||
| ToggleHelpMenu
|
| ToggleHelpMenu
|
||||||
| ToggleSettingMenu
|
|
||||||
| NotificationEvent
|
| NotificationEvent
|
||||||
| SetUnreadNotifications
|
| SetUnreadNotifications;
|
||||||
| SwitchLanguage
|
|
||||||
| SetSettingMenuBackgroundColor;
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -7,7 +7,6 @@ import {NavBarGuard} from './services/nav-bar-guard.service';
|
|||||||
import {FullScreenGuard} from './services/full-screen-guard.service';
|
import {FullScreenGuard} from './services/full-screen-guard.service';
|
||||||
import {SessionClearedComponent} from './components/session-cleared/session-cleared.component';
|
import {SessionClearedComponent} from './components/session-cleared/session-cleared.component';
|
||||||
import {NotFoundComponent} from './components/not-found/not-found.component';
|
import {NotFoundComponent} from './components/not-found/not-found.component';
|
||||||
import { ProductionGuard } from './services/production-guard.service';
|
|
||||||
|
|
||||||
|
|
||||||
const routes = [
|
const routes = [
|
||||||
@ -22,7 +21,7 @@ const routes = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '**', component: NotFoundComponent,
|
path: '**', component: NotFoundComponent,
|
||||||
canActivate: [NavBarGuard, ProductionGuard]
|
canActivate: [NavBarGuard]
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@ -13,13 +13,11 @@ import { SchemaService } from './services/schema.service';
|
|||||||
import { FolderService } from './services/folder.service';
|
import { FolderService } from './services/folder.service';
|
||||||
import { TimespanService } from './services/timespan.service';
|
import { TimespanService } from './services/timespan.service';
|
||||||
import { ItemService } from './services/item.service';
|
import { ItemService } from './services/item.service';
|
||||||
import { TaskService } from './services/task.service';
|
|
||||||
import { AdminService } from './services/admin.service';
|
import { AdminService } from './services/admin.service';
|
||||||
import { EventService } from './services/event.service';
|
import { EventService } from './services/event.service';
|
||||||
import { TypeaheadService } from './services/typeahead.service';
|
import { TypeaheadService } from './services/typeahead.service';
|
||||||
import { UserService } from './services/user.service';
|
import { UserService } from './services/user.service';
|
||||||
import { ImageService } from './services/image.service';
|
import { ImageService } from './services/image.service';
|
||||||
import { DownloadService } from './services/download.service';
|
|
||||||
import { GeolocatorService } from './services/geolocator.service';
|
import { GeolocatorService } from './services/geolocator.service';
|
||||||
import { WeatherService} from './services/weather.service';
|
import { WeatherService} from './services/weather.service';
|
||||||
import { AppConfig } from './shared/app.config';
|
import { AppConfig } from './shared/app.config';
|
||||||
@ -45,13 +43,11 @@ export {
|
|||||||
ItemTypeService,
|
ItemTypeService,
|
||||||
TimespanService,
|
TimespanService,
|
||||||
ItemService,
|
ItemService,
|
||||||
TaskService,
|
|
||||||
AdminService,
|
AdminService,
|
||||||
EventService,
|
EventService,
|
||||||
TypeaheadService,
|
TypeaheadService,
|
||||||
UserService,
|
UserService,
|
||||||
ImageService,
|
ImageService,
|
||||||
DownloadService,
|
|
||||||
GeolocatorService,
|
GeolocatorService,
|
||||||
WeatherService,
|
WeatherService,
|
||||||
AppConfig,
|
AppConfig,
|
||||||
|
|||||||
@ -1,16 +1,16 @@
|
|||||||
// angular modules
|
// angular modules
|
||||||
import { CommonModule } from '@angular/common';
|
import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf,InjectionToken } from '@angular/core';
|
||||||
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
|
import { CommonModule, DatePipe } from '@angular/common';
|
||||||
import { InjectionToken, NgModule } from '@angular/core';
|
import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
|
||||||
import { FormsModule } from '@angular/forms';
|
import { FormsModule } from '@angular/forms';
|
||||||
|
|
||||||
// external modules
|
// external modules
|
||||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
import { OAuthModule, AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc';
|
||||||
|
import { StoreModule, Store } from '@ngrx/store';
|
||||||
import { EffectsModule } from '@ngrx/effects';
|
import { EffectsModule } from '@ngrx/effects';
|
||||||
import { StoreModule } from '@ngrx/store';
|
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
import { OAuthModule } from 'angular-oauth2-oidc';
|
|
||||||
import { ClipboardModule } from 'ngx-clipboard';
|
|
||||||
import { UploadxModule } from 'ngx-uploadx';
|
import { UploadxModule } from 'ngx-uploadx';
|
||||||
|
import { ClipboardModule } from 'ngx-clipboard';
|
||||||
|
|
||||||
|
|
||||||
// routing module
|
// routing module
|
||||||
@ -19,138 +19,186 @@ import { AppCommonRoutingModule } from './common-routing.module';
|
|||||||
import { MODULE_NAME } from './module-name';
|
import { MODULE_NAME } from './module-name';
|
||||||
|
|
||||||
//components
|
//components
|
||||||
import { AvatarModule } from 'ngx-avatars';
|
import { SafePipe } from './shared/safe.pipe';
|
||||||
import { ImageCropperModule } from 'ngx-image-cropper';
|
import { AuthConfigFactory, IAuthconfigFactory } from './shared/authconfigFactory';
|
||||||
import * as commonActions from './actions/app-common.actions';
|
|
||||||
import { AppMenuComponent } from './components/app-menu/app-menu.component';
|
|
||||||
import { AppComponent } from './components/app/app.component';
|
import { AppComponent } from './components/app/app.component';
|
||||||
import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component';
|
import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component';
|
||||||
import { AvatarComponent } from './components/avatar/avatar.component';
|
import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
|
||||||
import { BackButtonComponent } from './components/back-button/back-button.component';
|
import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component';
|
||||||
import { EditImageModalComponent } from './components/edit-image-modal/edit-image-modal.component';
|
|
||||||
import { GradientSelectComponent } from './components/gradient-select/gradient-select.component';
|
|
||||||
import { GradientComponent } from './components/gradient/gradient.component';
|
|
||||||
import { HasClaimDirective } from './components/has-claim/has-claim.directive';
|
|
||||||
import { HasPackageDirective } from './components/has-package/has-package.directive';
|
|
||||||
import { HasRoleDirective } from './components/has-role/has-role.directive';
|
|
||||||
import { HelpMenuComponent } from './components/help-menu/help-menu.component';
|
|
||||||
import { SettingMenuComponent } from './components/setting-menu/setting-menu.component';
|
|
||||||
import { ItemLinkComponent } from './components/item-link/item-link.component';
|
|
||||||
import { MenuBackgroundComponent } from './components/menu-background/menu-background.component';
|
|
||||||
import { NotFoundComponent } from './components/not-found/not-found.component';
|
import { NotFoundComponent } from './components/not-found/not-found.component';
|
||||||
import { NotImplementedComponent } from './components/not-implemented/not-implemented.component';
|
import { NotImplementedComponent } from './components/not-implemented/not-implemented.component';
|
||||||
import { NotificationMenuComponent } from './components/notification-menu/notification-menu.component';
|
|
||||||
import { PackageExistsDirective } from './components/package-exists/package-exists.directive';
|
|
||||||
import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component';
|
|
||||||
import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
|
|
||||||
import { SidePanelComponent } from './components/side-panel/side-panel.component';
|
import { SidePanelComponent } from './components/side-panel/side-panel.component';
|
||||||
import { TagInputComponent } from './components/tag-input/tag-input.component';
|
|
||||||
import { ThumbnailComponent } from './components/thumbnail/thumbnail.component';
|
|
||||||
import { TimespanComponent } from './components/timespan/timespan.component';
|
import { TimespanComponent } from './components/timespan/timespan.component';
|
||||||
import { UserMenuComponent } from './components/user-menu/user-menu.component';
|
import { TagInputComponent } from './components/tag-input/tag-input.component';
|
||||||
import * as commonEffects from './effects/app-common.effects';
|
import { MenuBackgroundComponent } from './components/menu-background/menu-background.component';
|
||||||
|
import { HasPackageDirective} from './components/has-package/has-package.directive';
|
||||||
|
import { PackageExistsDirective} from './components/package-exists/package-exists.directive';
|
||||||
|
import { HasClaimDirective } from './components/has-claim/has-claim.directive';
|
||||||
|
import { HasRoleDirective } from './components/has-role/has-role.directive';
|
||||||
|
import { UserMenuComponent} from './components/user-menu/user-menu.component';
|
||||||
|
import { ThumbnailComponent } from './components/thumbnail/thumbnail.component';
|
||||||
import { Alert } from './enumerations/alert.enum';
|
import { Alert } from './enumerations/alert.enum';
|
||||||
import { IDataLayer } from './models/data.layer';
|
|
||||||
import { IEventMessage } from './models/event.message';
|
import { IEventMessage } from './models/event.message';
|
||||||
import { IColor, IGradientstop } from './models/gradient';
|
|
||||||
import { IItem, Item } from './models/item';
|
import { IItem, Item } from './models/item';
|
||||||
import { IItemType } from './models/item.type';
|
|
||||||
import { IItemTypes } from './models/item.types';
|
|
||||||
import { IItemLinkType } from './models/itemlink.type';
|
|
||||||
import { IItemTask, ItemTask } from './models/itemTask';
|
|
||||||
import { IJsonline } from './models/json-line';
|
|
||||||
import { IListItem } from './models/list.item';
|
|
||||||
import { IPackage, IPackages } from './models/package';
|
|
||||||
import { IQueryState } from './models/query.state';
|
|
||||||
import { ISenMLItem } from './models/senml-item';
|
|
||||||
import { ITypeaheadItem } from './models/typeahead.item';
|
|
||||||
import { IUrlType } from './models/url.type';
|
|
||||||
import { IUser } from './models/user';
|
|
||||||
import { WeatherCurrentObservation } from './models/weatherCurrentObservation';
|
import { WeatherCurrentObservation } from './models/weatherCurrentObservation';
|
||||||
|
import { IItemType } from './models/item.type';
|
||||||
|
import { IItemLinkType} from './models/itemlink.type';
|
||||||
|
import {IUrlType} from './models/url.type';
|
||||||
|
import { IItemTypes } from './models/item.types';
|
||||||
|
import { IItemTask, ItemTask } from './models/itemTask';
|
||||||
|
import { IListItem } from './models/list.item';
|
||||||
|
import { ITypeaheadItem } from './models/typeahead.item'
|
||||||
|
import { IJsonline } from './models/json-line';
|
||||||
|
import { ISenMLItem } from './models/senml-item';
|
||||||
|
import { IPackage,IPackages } from './models/package';
|
||||||
|
import { IUser } from './models/user';
|
||||||
|
import { IQueryState } from './models/query.state';
|
||||||
|
import { IDataLayer } from './models/data.layer';
|
||||||
|
import { IColor,IGradientstop} from './models/gradient';
|
||||||
|
import * as commonActions from './actions/app-common.actions';
|
||||||
import * as commonReducers from './reducers/app-common.reducer';
|
import * as commonReducers from './reducers/app-common.reducer';
|
||||||
import { AuthConfigFactory, IAuthconfigFactory } from './shared/authconfigFactory';
|
import * as commonEffects from './effects/app-common.effects';
|
||||||
import { SafePipe } from './shared/safe.pipe';
|
import { SecureOAuthStorage} from './shared/secureOAuthStorage';
|
||||||
import { SecureOAuthStorage } from './shared/secureOAuthStorage';
|
import { GradientComponent } from './components/gradient/gradient.component';
|
||||||
|
import { GradientSelectComponent } from './components/gradient-select/gradient-select.component';
|
||||||
|
import { AppMenuComponent } from './components/app-menu/app-menu.component';
|
||||||
|
import { NotificationMenuComponent} from './components/notification-menu/notification-menu.component';
|
||||||
|
import { HelpMenuComponent} from './components/help-menu/help-menu.component';
|
||||||
|
import { BackButtonComponent } from './components/back-button/back-button.component';
|
||||||
|
import { EditImageModalComponent } from './components/edit-image-modal/edit-image-modal.component';
|
||||||
|
import { AvatarComponent } from './components/avatar/avatar.component';
|
||||||
|
import { ItemLinkComponent } from './components/item-link/item-link.component';
|
||||||
|
import { AvatarModule } from 'ngx-avatar';
|
||||||
|
import { ImageCropperModule } from 'ngx-image-cropper';
|
||||||
|
|
||||||
export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage');
|
export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage');
|
||||||
|
|
||||||
export {
|
export {
|
||||||
Alert, AppComponent, AuthCallbackComponent, AuthConfigFactory, AvatarComponent, BackButtonComponent, commonActions,
|
SafePipe,
|
||||||
commonReducers, EditImageModalComponent,
|
AuthCallbackComponent,
|
||||||
|
AppComponent,
|
||||||
|
SessionClearedComponent,
|
||||||
|
ResumableFileUploadComponent,
|
||||||
|
NotFoundComponent,
|
||||||
|
NotImplementedComponent,
|
||||||
|
SidePanelComponent,
|
||||||
|
TimespanComponent,
|
||||||
|
TagInputComponent,
|
||||||
|
UserMenuComponent,
|
||||||
|
ThumbnailComponent,
|
||||||
|
HasPackageDirective,
|
||||||
|
PackageExistsDirective,
|
||||||
|
HasClaimDirective,
|
||||||
|
HasRoleDirective,
|
||||||
|
Alert,
|
||||||
|
IEventMessage,
|
||||||
|
IItem,
|
||||||
|
Item,
|
||||||
|
IItemType,
|
||||||
|
IItemLinkType,
|
||||||
|
IUrlType,
|
||||||
|
IItemTypes,
|
||||||
|
IItemTask,
|
||||||
|
ItemTask,
|
||||||
|
IListItem,
|
||||||
|
ITypeaheadItem,
|
||||||
|
IUser,
|
||||||
|
IQueryState,
|
||||||
|
IPackage,
|
||||||
|
IPackages,
|
||||||
|
commonActions,
|
||||||
|
commonReducers,
|
||||||
|
IAuthconfigFactory,
|
||||||
|
AuthConfigFactory,
|
||||||
|
MenuBackgroundComponent,
|
||||||
|
SecureOAuthStorage,
|
||||||
|
WeatherCurrentObservation,
|
||||||
|
IJsonline,
|
||||||
|
ISenMLItem,
|
||||||
|
IDataLayer,
|
||||||
|
IColor,
|
||||||
|
IGradientstop,
|
||||||
|
BackButtonComponent,
|
||||||
|
AvatarComponent,
|
||||||
|
ItemLinkComponent,
|
||||||
|
EditImageModalComponent,
|
||||||
GradientComponent,
|
GradientComponent,
|
||||||
GradientSelectComponent, HasClaimDirective, HasPackageDirective, HasRoleDirective, IAuthconfigFactory, IColor, IDataLayer, IEventMessage, IGradientstop, IItem, IItemLinkType, IItemTask, IItemType, IItemTypes, IJsonline, IListItem, IPackage,
|
GradientSelectComponent
|
||||||
IPackages, IQueryState, ISenMLItem, Item, ItemLinkComponent, ItemTask, ITypeaheadItem, IUrlType, IUser, MenuBackgroundComponent, NotFoundComponent,
|
|
||||||
NotImplementedComponent, PackageExistsDirective, ResumableFileUploadComponent, SafePipe, SecureOAuthStorage, SessionClearedComponent, SidePanelComponent, TagInputComponent, ThumbnailComponent, TimespanComponent, UserMenuComponent, WeatherCurrentObservation
|
|
||||||
};
|
};
|
||||||
|
|
||||||
@NgModule({ declarations: [
|
@NgModule({
|
||||||
AppComponent,
|
imports: [
|
||||||
AuthCallbackComponent,
|
CommonModule,
|
||||||
SidePanelComponent,
|
HttpClientModule,
|
||||||
SafePipe,
|
AppCommonRoutingModule,
|
||||||
NotFoundComponent,
|
StoreModule.forFeature(MODULE_NAME, commonReducers.reducer),
|
||||||
NotImplementedComponent,
|
EffectsModule.forFeature([commonEffects.AppCommonEffects]),
|
||||||
ResumableFileUploadComponent,
|
OAuthModule.forRoot(),
|
||||||
TimespanComponent,
|
NgbModule,
|
||||||
TagInputComponent,
|
FormsModule,
|
||||||
SessionClearedComponent,
|
UploadxModule,
|
||||||
MenuBackgroundComponent,
|
ClipboardModule,
|
||||||
HasPackageDirective,
|
AvatarModule,
|
||||||
PackageExistsDirective,
|
ImageCropperModule
|
||||||
HasClaimDirective,
|
],
|
||||||
HasRoleDirective,
|
declarations: [
|
||||||
UserMenuComponent,
|
AppComponent,
|
||||||
GradientComponent,
|
AuthCallbackComponent,
|
||||||
GradientSelectComponent,
|
SidePanelComponent,
|
||||||
AppMenuComponent,
|
SafePipe,
|
||||||
NotificationMenuComponent,
|
NotFoundComponent,
|
||||||
HelpMenuComponent,
|
NotImplementedComponent,
|
||||||
SettingMenuComponent,
|
ResumableFileUploadComponent,
|
||||||
BackButtonComponent,
|
TimespanComponent,
|
||||||
ThumbnailComponent,
|
TagInputComponent,
|
||||||
EditImageModalComponent,
|
SessionClearedComponent,
|
||||||
AvatarComponent,
|
MenuBackgroundComponent,
|
||||||
ItemLinkComponent
|
HasPackageDirective,
|
||||||
],
|
PackageExistsDirective,
|
||||||
exports: [
|
HasClaimDirective,
|
||||||
NgbModule,
|
HasRoleDirective,
|
||||||
UploadxModule,
|
UserMenuComponent,
|
||||||
ClipboardModule,
|
GradientComponent,
|
||||||
CommonModule,
|
GradientSelectComponent,
|
||||||
AppComponent,
|
AppMenuComponent,
|
||||||
ResumableFileUploadComponent,
|
NotificationMenuComponent,
|
||||||
AuthCallbackComponent,
|
HelpMenuComponent,
|
||||||
SidePanelComponent,
|
BackButtonComponent,
|
||||||
SafePipe,
|
ThumbnailComponent,
|
||||||
NotFoundComponent,
|
EditImageModalComponent,
|
||||||
NotImplementedComponent,
|
AvatarComponent,
|
||||||
ResumableFileUploadComponent,
|
ItemLinkComponent
|
||||||
TimespanComponent,
|
],
|
||||||
TagInputComponent,
|
exports: [
|
||||||
SessionClearedComponent,
|
NgbModule,
|
||||||
MenuBackgroundComponent,
|
UploadxModule,
|
||||||
HasPackageDirective,
|
ClipboardModule,
|
||||||
PackageExistsDirective,
|
CommonModule,
|
||||||
HasClaimDirective,
|
AppComponent,
|
||||||
HasRoleDirective,
|
ResumableFileUploadComponent,
|
||||||
UserMenuComponent,
|
AuthCallbackComponent,
|
||||||
GradientComponent,
|
SidePanelComponent,
|
||||||
GradientSelectComponent,
|
SafePipe,
|
||||||
BackButtonComponent,
|
NotFoundComponent,
|
||||||
ThumbnailComponent,
|
NotImplementedComponent,
|
||||||
AvatarComponent,
|
ResumableFileUploadComponent,
|
||||||
ItemLinkComponent,
|
TimespanComponent,
|
||||||
EditImageModalComponent
|
TagInputComponent,
|
||||||
], imports: [CommonModule,
|
SessionClearedComponent,
|
||||||
AppCommonRoutingModule,
|
MenuBackgroundComponent,
|
||||||
StoreModule.forFeature(MODULE_NAME, commonReducers.reducer),
|
HasPackageDirective,
|
||||||
EffectsModule.forFeature([commonEffects.AppCommonEffects]),
|
PackageExistsDirective,
|
||||||
OAuthModule.forRoot(),
|
HasClaimDirective,
|
||||||
NgbModule,
|
HasRoleDirective,
|
||||||
FormsModule,
|
UserMenuComponent,
|
||||||
UploadxModule,
|
GradientComponent,
|
||||||
ClipboardModule,
|
GradientSelectComponent,
|
||||||
AvatarModule,
|
BackButtonComponent,
|
||||||
ImageCropperModule], providers: [provideHttpClient(withInterceptorsFromDi())] })
|
ThumbnailComponent,
|
||||||
|
AvatarComponent,
|
||||||
|
ItemLinkComponent,
|
||||||
|
EditImageModalComponent
|
||||||
|
]
|
||||||
|
})
|
||||||
export class AppCommonModule {
|
export class AppCommonModule {
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,6 @@
|
|||||||
<fm-resumable-file-upload></fm-resumable-file-upload>
|
<fm-resumable-file-upload></fm-resumable-file-upload>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<div class="user-menu apponly">
|
<div class="user-menu apponly">
|
||||||
<fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async" [backgroundColor]="settingMenuBackgroundColor|async"></fm-setting-menu>
|
|
||||||
<fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
|
<fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
|
||||||
<fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
|
<fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
|
||||||
<fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>
|
<fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>
|
||||||
|
|||||||
@ -1,3 +1,9 @@
|
|||||||
|
/* Import Bootstrap & Fonts */
|
||||||
|
|
||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// custom styles
|
// custom styles
|
||||||
|
|
||||||
.btn:focus {
|
.btn:focus {
|
||||||
@ -10,7 +16,7 @@
|
|||||||
|
|
||||||
.form-control:focus {
|
.form-control:focus {
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
border-color: var(--bs-input-border-color);
|
border-color: $input-border-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -119,7 +125,7 @@ body { background: #f1f1f1; line-height: 18px; user-select:none;font-family: Lat
|
|||||||
max-height:0em;
|
max-height:0em;
|
||||||
}
|
}
|
||||||
|
|
||||||
fm-help-menu,fm-app-menu,fm-user-menu,fm-notification-menu,fm-setting-menu {
|
fm-help-menu,fm-app-menu,fm-user-menu,fm-notification-menu {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin-left: 1rem;
|
margin-left: 1rem;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -45,12 +45,10 @@ export class AppComponent implements OnInit, OnDestroy {
|
|||||||
public accountMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetAccountMenuVisible);
|
public accountMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetAccountMenuVisible);
|
||||||
public appMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetAppMenuVisible);
|
public appMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetAppMenuVisible);
|
||||||
public notificationMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetNotificationMenuVisible);
|
public notificationMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetNotificationMenuVisible);
|
||||||
public settingMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetSettingMenuVisible);
|
|
||||||
public helpMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetHelpMenuVisible);
|
public helpMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetHelpMenuVisible);
|
||||||
public unreadNotifications: Observable<number> = this.store$.select(appReducers.SelectgetUnreadNotifications);
|
public unreadNotifications: Observable<number> = this.store$.select(appReducers.SelectgetUnreadNotifications);
|
||||||
public user: Observable<IUser> = this.store$.select(appReducers.SelectGetUser);
|
public user: Observable<IUser> = this.store$.select(appReducers.SelectGetUser);
|
||||||
public isPageMode: Observable<boolean> = this.store$.select(appReducers.SelectGetIsPageMode);
|
public isPageMode: Observable<boolean> = this.store$.select(appReducers.SelectGetIsPageMode);
|
||||||
public settingMenuBackgroundColor: Observable<string> = this.store$.select(appReducers.SelectGetSettingMenuBackgroundColor);
|
|
||||||
@Input() showUploadProgress = true;
|
@Input() showUploadProgress = true;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import { Router } from '@angular/router';
|
import { Router, CanActivate } from '@angular/router';
|
||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { OAuthService } from 'angular-oauth2-oidc';
|
import { OAuthService } from 'angular-oauth2-oidc';
|
||||||
import { } from '@angular/router';
|
import { } from '@angular/router';
|
||||||
@ -6,7 +6,7 @@ import { } from '@angular/router';
|
|||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class AuthCallbackGuard {
|
export class AuthCallbackGuard implements CanActivate {
|
||||||
|
|
||||||
constructor(private router$: Router,private oauthService$:OAuthService) {}
|
constructor(private router$: Router,private oauthService$:OAuthService) {}
|
||||||
|
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
<span class="avatar-container" [title]="name">
|
<span class="avatar-container" [title]="name">
|
||||||
<ngx-avatars
|
<ngx-avatar
|
||||||
class="farmmaps-avatar"
|
class="farmmaps-avatar"
|
||||||
[src]="src"
|
[src]="src"
|
||||||
[name]="name"
|
[name]="name"
|
||||||
[size]="size"
|
[size]="size"
|
||||||
[round]='true'
|
[round]='true'
|
||||||
>
|
>
|
||||||
</ngx-avatars>
|
</ngx-avatar>
|
||||||
</span>
|
</span>
|
||||||
@ -1,10 +1,12 @@
|
|||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
.back-button {
|
.back-button {
|
||||||
cursor: default;
|
cursor: default;
|
||||||
color: var(--bs-primary);
|
color: $primary;
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.back-button:hover {
|
.back-button:hover {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
color: var(--bs-secondary);
|
color: $secondary;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { Location } from "@angular/common";
|
import {Component, HostListener} from '@angular/core';
|
||||||
import { Component, EventEmitter, HostListener, Output } from '@angular/core';
|
import {Location} from "@angular/common";
|
||||||
import { DeviceService } from '../../services/device.service';
|
import { DeviceService} from '../../services/device.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-back-button',
|
selector: 'fm-back-button',
|
||||||
@ -8,18 +8,16 @@ import { DeviceService } from '../../services/device.service';
|
|||||||
styleUrls: ['./back-button.component.scss']
|
styleUrls: ['./back-button.component.scss']
|
||||||
})
|
})
|
||||||
export class BackButtonComponent {
|
export class BackButtonComponent {
|
||||||
@Output() beforeLocationBack = new EventEmitter();
|
|
||||||
|
|
||||||
@HostListener('click')
|
@HostListener('click')
|
||||||
onBackClicked() {
|
onBackClicked() {
|
||||||
this.beforeLocationBack.emit();
|
|
||||||
this.location.back();
|
this.location.back();
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor(private location: Location,private deviceService:DeviceService) {
|
constructor(private location: Location,private deviceService:DeviceService) { }
|
||||||
}
|
|
||||||
|
|
||||||
public show() {
|
public show() {
|
||||||
return !this.deviceService.IsMobile();
|
return !this.deviceService.IsMobile();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
<i class="fal fa-image"></i>
|
<i class="fal fa-image"></i>
|
||||||
<div i18n>No image selected</div>
|
<div i18n>No image selected</div>
|
||||||
</div>
|
</div>
|
||||||
<image-cropper #imageCropper output="base64"
|
<image-cropper #imageCropper
|
||||||
[imageChangedEvent]="imageChangedEvent"
|
[imageChangedEvent]="imageChangedEvent"
|
||||||
[maintainAspectRatio]="true"
|
[maintainAspectRatio]="true"
|
||||||
[format]="imageType"
|
[format]="imageType"
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Component, OnInit,ViewChild,ElementRef,EventEmitter, Output } from '@angular/core';
|
import { Component, OnInit,ViewChild,ElementRef,EventEmitter, Output } from '@angular/core';
|
||||||
import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
|
import { HttpClient, HttpParams,HttpHeaders } from "@angular/common/http";
|
||||||
import {NgbModal} from "@ng-bootstrap/ng-bootstrap"
|
import {NgbModal} from "@ng-bootstrap/ng-bootstrap"
|
||||||
import { ImageCroppedEvent,LoadedImage } from 'ngx-image-cropper';
|
import { ImageCroppedEvent,LoadedImage } from 'ngx-image-cropper';
|
||||||
import {ImageService } from '../../services/image.service';
|
import {ImageService } from '../../services/image.service';
|
||||||
|
|||||||
@ -1,10 +1,13 @@
|
|||||||
|
/* Import Bootstrap & Fonts */
|
||||||
|
|
||||||
|
@import "~bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
div.resumable-file-upload {
|
div.resumable-file-upload {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
right: 0px;
|
right: 0px;
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
width: 300px;
|
width: 300px;
|
||||||
max-height: 250px;
|
max-height: 250px;
|
||||||
z-index: 1;
|
|
||||||
/*z-index:2000 !important;*/
|
/*z-index:2000 !important;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,7 +76,7 @@ div.card-header span.fa {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.upload-file.busy > div > span.fa-times {
|
.upload-file.busy > div > span.fa-times {
|
||||||
color: var(--bs-danger);
|
color: $danger;
|
||||||
width: 20px;
|
width: 20px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
@ -91,7 +94,7 @@ div.card-header span.fa {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.upload-file > div.errormessage {
|
.upload-file > div.errormessage {
|
||||||
color: var(--bs-danger);
|
color: $danger;
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +0,0 @@
|
|||||||
<div>
|
|
||||||
<div (click)="toggle($event)" class="rounded-circle menu-button hidden" [style.background-color]="backgroundColor" [ngClass]="{'hidden':!user || noContent}">
|
|
||||||
<span i18n-title title="Settings"><i class="fas fa-gear" aria-hidden="true"></i></span>
|
|
||||||
<div class="menu hidden" [ngClass]="{'hidden':!showMenu}">
|
|
||||||
<router-outlet name="setting-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@ -1,80 +0,0 @@
|
|||||||
.menu-button {
|
|
||||||
background-color: gray;
|
|
||||||
display: inline-block;
|
|
||||||
width: 2.5em;
|
|
||||||
height: 2.5em;
|
|
||||||
line-height: 2.5em;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 1rem;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.menu-button > span {
|
|
||||||
color:white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.menu {
|
|
||||||
max-height: calc( 100vh - 4rem);
|
|
||||||
//transition: max-height 0.2s;
|
|
||||||
overflow: hidden;
|
|
||||||
box-shadow: 0 0 20px rgba(0,0,0,.3);
|
|
||||||
position: fixed;
|
|
||||||
top: 3.4rem;
|
|
||||||
right:0.5rem;
|
|
||||||
left:0.5rem;
|
|
||||||
background-color: #fff;
|
|
||||||
border-radius: 0.25rem;
|
|
||||||
padding: 0.5rem;
|
|
||||||
z-index: 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
:host-context(.fullscreen) .menu {
|
|
||||||
top:4em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card {
|
|
||||||
padding:0.5rem;
|
|
||||||
min-width: 10rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card-body {
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
.hidden {
|
|
||||||
max-height: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.menu.hidden {
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.menu-button.hidden {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@media screen and (min-width: 44rem) {
|
|
||||||
.menu {
|
|
||||||
position: absolute;
|
|
||||||
top: 3rem;
|
|
||||||
right:0;
|
|
||||||
left: unset;
|
|
||||||
max-width: 30em;
|
|
||||||
}
|
|
||||||
|
|
||||||
:host-context(.fullscreen) .menu {
|
|
||||||
top: 3rem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.unread {
|
|
||||||
display: block;
|
|
||||||
position: absolute;
|
|
||||||
top:-0.5em;
|
|
||||||
right: -0.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.unread.hidden {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
import { Input } from '@angular/core';
|
|
||||||
import { Component, OnInit } from '@angular/core';
|
|
||||||
|
|
||||||
import { IUser } from '../../models/user';
|
|
||||||
import {Store} from '@ngrx/store';
|
|
||||||
import * as appReducers from '../../reducers/app-common.reducer';
|
|
||||||
import * as appActions from '../../actions/app-common.actions';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'fm-setting-menu',
|
|
||||||
templateUrl: './setting-menu.component.html',
|
|
||||||
styleUrls: ['./setting-menu.component.scss']
|
|
||||||
})
|
|
||||||
export class SettingMenuComponent implements OnInit {
|
|
||||||
|
|
||||||
@Input() user:IUser;
|
|
||||||
@Input() showMenu:boolean;
|
|
||||||
@Input() backgroundColor:string;
|
|
||||||
public noContent = true;
|
|
||||||
|
|
||||||
constructor(private store: Store<appReducers.State>) { }
|
|
||||||
|
|
||||||
ngOnInit(): void {
|
|
||||||
}
|
|
||||||
|
|
||||||
toggle(event:MouseEvent) {
|
|
||||||
event.stopPropagation();
|
|
||||||
this.store.dispatch(new appActions.ToggleSettingMenu());
|
|
||||||
}
|
|
||||||
|
|
||||||
activateRoute() {
|
|
||||||
this.noContent=false;
|
|
||||||
}
|
|
||||||
|
|
||||||
deActivateRoute() {
|
|
||||||
this.noContent=true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
<div class="side-panel hidden" [ngClass]="{'hidden':!visible,'collapsed':collapsed,'resizeable':(resizeable && mobile),'resizing':resizing,'left':left,'extrawide':extrawide}" [ngStyle]="{'top':top}">
|
<div class="side-panel hidden" [ngClass]="{'hidden':!visible,'collapsed':collapsed,'resizeable':(resizeable && mobile),'resizing':resizing,'left':left}" [ngStyle]="{'top':top}">
|
||||||
<div *ngIf="collapsable" class="arrow rounded-end p-2" (click)="handleToggleClick($event)">
|
<div *ngIf="collapsable" class="arrow rounded-end p-2" (click)="handleToggleClick($event)">
|
||||||
<i class="fal fa-chevron-left" aria-hidden="true"></i>
|
<i class="fal fa-chevron-left" aria-hidden="true"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.side-panel.collapsed {
|
.side-panel.collapsed {
|
||||||
left:-44rem;
|
left:-22rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.arrow {
|
.arrow {
|
||||||
@ -75,7 +75,8 @@ div.resizegrip > span {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.resizeable .resizegrip {
|
.resizeable .resizegrip {
|
||||||
display:block;
|
display:block;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.resizeable .content {
|
.resizeable .content {
|
||||||
@ -93,16 +94,9 @@ div.resizegrip > span {
|
|||||||
|
|
||||||
.side-panel.hidden {
|
.side-panel.hidden {
|
||||||
width: 22rem;
|
width: 22rem;
|
||||||
left:-22rem;
|
left:-24rem;
|
||||||
height:100%;
|
height:100%;
|
||||||
top: 0px;
|
top: 0px;
|
||||||
}
|
|
||||||
|
|
||||||
.side-panel.extrawide {
|
|
||||||
top:0px;
|
|
||||||
width: 44rem;
|
|
||||||
height:100%;
|
|
||||||
left:0px;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import { Component, Input,Output,ViewChild,EventEmitter, ElementRef,OnChanges,SimpleChanges,HostListener,ChangeDetectorRef, ViewEncapsulation } from '@angular/core';
|
import { Component, Input,Output,ViewChild,EventEmitter, ElementRef,OnChanges,SimpleChanges,HostListener,ChangeDetectorRef } from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-side-panel',
|
selector: 'fm-side-panel',
|
||||||
@ -12,8 +12,7 @@ export class SidePanelComponent implements OnChanges {
|
|||||||
@Input() public collapsed: boolean;
|
@Input() public collapsed: boolean;
|
||||||
@Input() public collapsable: boolean;
|
@Input() public collapsable: boolean;
|
||||||
@Input() public resizeable = false;
|
@Input() public resizeable = false;
|
||||||
@Input() public left = false;
|
@Input() public left = false;
|
||||||
@Input() public extrawide: boolean;
|
|
||||||
@Output() onResize: EventEmitter<number> = new EventEmitter<number>();
|
@Output() onResize: EventEmitter<number> = new EventEmitter<number>();
|
||||||
@ViewChild("resizeGrip") elementView: ElementRef;
|
@ViewChild("resizeGrip") elementView: ElementRef;
|
||||||
public mobile = true;
|
public mobile = true;
|
||||||
@ -42,7 +41,7 @@ export class SidePanelComponent implements OnChanges {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ngAfterViewInit() {
|
ngAfterViewInit() {
|
||||||
this.parentHeight = this.element.nativeElement.offsetParent?.clientHeight;
|
this.parentHeight = this.element.nativeElement.offsetParent.clientHeight;
|
||||||
this.setTop();
|
this.setTop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -5,9 +5,6 @@
|
|||||||
<div class="card" *ngIf="user">
|
<div class="card" *ngIf="user">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="username">{{user.name}}</div>
|
<div class="username">{{user.name}}</div>
|
||||||
<div *ngIf="getProvider(); let provider">
|
|
||||||
<small><span i18n>Provider</span><span> {{provider}}</span></small>
|
|
||||||
</div>
|
|
||||||
<div><a href="#" (click)="logout($event)" i18n>logout</a></div>
|
<div><a href="#" (click)="logout($event)" i18n>logout</a></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -20,14 +20,11 @@ export class UserMenuComponent implements OnInit {
|
|||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
}
|
}
|
||||||
|
|
||||||
getProvider():string | null {
|
getLetter():string {
|
||||||
const ownedClaims = this.oauthService.getIdentityClaims();
|
if (this.user && this.user.firstName && this.user.lastName)
|
||||||
if(ownedClaims) {
|
return this.user.firstName.substr(0,1).toUpperCase() +
|
||||||
if (ownedClaims["idp"] != "local") {
|
this.user.lastName.substr(0,1).toUpperCase();
|
||||||
return ownedClaims["idp"];
|
return this.user && this.user.name ? this.user.name.substr(0,1).toUpperCase():"";
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logout(event:MouseEvent) {
|
logout(event:MouseEvent) {
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import { Injectable, Inject, LOCALE_ID } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
|
import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
|
||||||
import { Store } from '@ngrx/store';
|
import { Store } from '@ngrx/store';
|
||||||
@ -16,7 +16,6 @@ import {StateSerializerService} from '../services/state-serializer.service';
|
|||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class AppCommonEffects {
|
export class AppCommonEffects {
|
||||||
locale: string;
|
|
||||||
|
|
||||||
login$ = createEffect(() => this.actions$.pipe(
|
login$ = createEffect(() => this.actions$.pipe(
|
||||||
ofType(appCommonActions.LOGIN),
|
ofType(appCommonActions.LOGIN),
|
||||||
@ -48,27 +47,11 @@ export class AppCommonEffects {
|
|||||||
first(),
|
first(),
|
||||||
switchMap((action) => {
|
switchMap((action) => {
|
||||||
return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
|
return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
|
||||||
switchMap(([user,userInfo]) => {
|
switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))} ),
|
||||||
if (location.hostname === 'localhost' || user.language === undefined || user.language === this.locale)
|
|
||||||
{
|
|
||||||
return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))
|
|
||||||
}
|
|
||||||
return of(new appCommonActions.SwitchLanguage(user.language))
|
|
||||||
}),
|
|
||||||
catchError(error => of(new appCommonActions.Fail(error))))
|
catchError(error => of(new appCommonActions.Fail(error))))
|
||||||
}
|
}
|
||||||
)));
|
)));
|
||||||
|
|
||||||
switchLanguage$ = createEffect(() => this.actions$.pipe(
|
|
||||||
ofType(appCommonActions.SWITCHLANGUAGE),
|
|
||||||
switchMap((action) => {
|
|
||||||
const a = action as appCommonActions.SwitchLanguage;
|
|
||||||
if (location.href.includes(`/${this.locale}/`)) {
|
|
||||||
const newPath = location.href.replace(`/${this.locale}/`, `/${a.locale}/`);
|
|
||||||
location.replace(newPath);
|
|
||||||
}
|
|
||||||
return of(undefined);
|
|
||||||
})),{ dispatch:false});
|
|
||||||
|
|
||||||
initUserPackages$ = createEffect(() => this.actions$.pipe(
|
initUserPackages$ = createEffect(() => this.actions$.pipe(
|
||||||
ofType(appCommonActions.INITUSERPACKAGES),
|
ofType(appCommonActions.INITUSERPACKAGES),
|
||||||
@ -151,28 +134,21 @@ export class AppCommonEffects {
|
|||||||
withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)),
|
withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)),
|
||||||
switchMap(([action, itemtypes]) => {
|
switchMap(([action, itemtypes]) => {
|
||||||
const a = action as appCommonActions.EditItem;
|
const a = action as appCommonActions.EditItem;
|
||||||
var editor = "property";
|
var editor = "property";
|
||||||
if(a.item.itemType) {
|
if(a.item.itemType) {
|
||||||
const itemType = itemtypes[a.item.itemType];
|
const itemType = itemtypes[a.item.itemType];
|
||||||
var editor = itemType && itemType.editor ? itemType.editor : editor;
|
var editor = itemType && itemType.editor ? itemType.editor : editor;
|
||||||
}
|
}
|
||||||
if (editor == 'croppingscheme') {
|
this.router$.navigate(['/editor',editor,'item', a.item.code])
|
||||||
// Exeception: no 'item' in route
|
return [];
|
||||||
this.router$.navigate(['/editor', editor, a.item.code])
|
}
|
||||||
}
|
)));
|
||||||
else {
|
|
||||||
this.router$.navigate(['/editor', editor, 'item', a.item.code])
|
|
||||||
}
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
)
|
|
||||||
));
|
|
||||||
|
|
||||||
viewItem$ = createEffect(() => this.actions$.pipe(
|
viewItem$ = createEffect(() => this.actions$.pipe(
|
||||||
ofType(appCommonActions.VIEWITEM),
|
ofType(appCommonActions.VIEWITEM),
|
||||||
withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)),
|
withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)),
|
||||||
switchMap(([action, itemtypes]) => {
|
switchMap(([action, itemtypes]) => {
|
||||||
const a = action as appCommonActions.ViewItem;
|
const a = action as appCommonActions.EditItem;
|
||||||
const itemType = itemtypes[a.item.itemType];
|
const itemType = itemtypes[a.item.itemType];
|
||||||
const viewer = itemType.viewer;
|
const viewer = itemType.viewer;
|
||||||
const editor = itemType.editor;
|
const editor = itemType.editor;
|
||||||
@ -225,8 +201,7 @@ export class AppCommonEffects {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService, @Inject(LOCALE_ID) locale: string) {
|
constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService) {
|
||||||
this.locale = locale;
|
|
||||||
store$.dispatch(new appCommonActions.LoadItemTypes());
|
store$.dispatch(new appCommonActions.LoadItemTypes());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,7 +25,6 @@ export class Item implements IItem {
|
|||||||
public state?: number;
|
public state?: number;
|
||||||
public data?:any;
|
public data?:any;
|
||||||
public isEditable?:boolean;
|
public isEditable?:boolean;
|
||||||
public owner?: string;
|
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
|
|
||||||
export interface IItemTask {
|
export interface IItemTask {
|
||||||
code?: string;
|
code?: string;
|
||||||
workflowCode?: string;
|
|
||||||
taskType?: string;
|
taskType?: string;
|
||||||
attributes?: any;
|
attributes?: any;
|
||||||
message?: string,
|
message?: string,
|
||||||
@ -12,7 +11,6 @@ export interface IItemTask {
|
|||||||
|
|
||||||
export class ItemTask implements IItemTask {
|
export class ItemTask implements IItemTask {
|
||||||
public code?:string;
|
public code?:string;
|
||||||
public workflowCode?: string;
|
|
||||||
public taskType?: string;
|
public taskType?: string;
|
||||||
public attributes?: any;
|
public attributes?: any;
|
||||||
public message?: string;
|
public message?: string;
|
||||||
@ -20,6 +18,6 @@ export class ItemTask implements IItemTask {
|
|||||||
public started?: Date;
|
public started?: Date;
|
||||||
public finished?: Date;
|
public finished?: Date;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -11,5 +11,4 @@ export interface IListItem {
|
|||||||
size?: number;
|
size?: number;
|
||||||
state?: number;
|
state?: number;
|
||||||
thumbnail?: boolean;
|
thumbnail?: boolean;
|
||||||
owner?: string;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,11 +26,9 @@ export interface State {
|
|||||||
appMenuVisible: boolean,
|
appMenuVisible: boolean,
|
||||||
notificationMenuVisible: boolean,
|
notificationMenuVisible: boolean,
|
||||||
helpMenuVisible: boolean,
|
helpMenuVisible: boolean,
|
||||||
settingMenuVisible: boolean,
|
|
||||||
unreadNotifications: number,
|
unreadNotifications: number,
|
||||||
isOnline: boolean,
|
isOnline: boolean,
|
||||||
isPageMode:boolean,
|
isPageMode:boolean
|
||||||
settingMenuBackgroundColor:string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const initialState: State = {
|
export const initialState: State = {
|
||||||
@ -49,11 +47,9 @@ export const initialState: State = {
|
|||||||
appMenuVisible: false,
|
appMenuVisible: false,
|
||||||
notificationMenuVisible: false,
|
notificationMenuVisible: false,
|
||||||
helpMenuVisible: false,
|
helpMenuVisible: false,
|
||||||
settingMenuVisible: false,
|
|
||||||
unreadNotifications: 0,
|
unreadNotifications: 0,
|
||||||
isOnline: true,
|
isOnline: true,
|
||||||
isPageMode: true,
|
isPageMode: true
|
||||||
settingMenuBackgroundColor:'rgb(128, 128, 128)'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function reducer(state = initialState, action: appCommonActions.Actions ): State {
|
export function reducer(state = initialState, action: appCommonActions.Actions ): State {
|
||||||
@ -68,8 +64,6 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
|
|||||||
code:a.user.code,
|
code:a.user.code,
|
||||||
email:claims["email"]!== undefined ? claims["email"] : a.user.name,
|
email:claims["email"]!== undefined ? claims["email"] : a.user.name,
|
||||||
name:claims["name"]!== undefined?claims["name"] : a.user.email,
|
name:claims["name"]!== undefined?claims["name"] : a.user.email,
|
||||||
lastName:a.user.lastName,
|
|
||||||
firstName:a.user.firstName,
|
|
||||||
claims:claims,
|
claims:claims,
|
||||||
searchable: false
|
searchable: false
|
||||||
};
|
};
|
||||||
@ -110,29 +104,26 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
case appCommonActions.TOGGLEMENU: {
|
case appCommonActions.TOGGLEMENU: {
|
||||||
return tassign(state, { menuVisible: !state.menuVisible,accountMenuVisible:!state.menuVisible?false:state.accountMenuVisible,appMenuVisible:!state.menuVisible?false:state.appMenuVisible,notificationMenuVisible:!state.menuVisible?false:state.notificationMenuVisible,helpMenuVisible:!state.menuVisible?false:state.helpMenuVisible,settingMenuVisible:!state.menuVisible?false:state.settingMenuVisible });
|
return tassign(state, { menuVisible: !state.menuVisible,accountMenuVisible:!state.menuVisible?false:state.accountMenuVisible,appMenuVisible:!state.menuVisible?false:state.appMenuVisible,notificationMenuVisible:!state.menuVisible?false:state.notificationMenuVisible,helpMenuVisible:!state.menuVisible?false:state.helpMenuVisible });
|
||||||
}
|
}
|
||||||
case appCommonActions.TOGGLEACCOUNTMENU: {
|
case appCommonActions.TOGGLEACCOUNTMENU: {
|
||||||
return tassign(state, { accountMenuVisible: !state.accountMenuVisible,appMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
|
return tassign(state, { accountMenuVisible: !state.accountMenuVisible,appMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false });
|
||||||
}
|
}
|
||||||
case appCommonActions.TOGGLEAPPMENU: {
|
case appCommonActions.TOGGLEAPPMENU: {
|
||||||
return tassign(state, { appMenuVisible: !state.appMenuVisible,accountMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
|
return tassign(state, { appMenuVisible: !state.appMenuVisible,accountMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false });
|
||||||
}
|
}
|
||||||
case appCommonActions.TOGGLENOTIFICATIONMENU: {
|
case appCommonActions.TOGGLENOTIFICATIONMENU: {
|
||||||
return tassign(state, { notificationMenuVisible : !state.notificationMenuVisible,accountMenuVisible:false,appMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
|
return tassign(state, { notificationMenuVisible : !state.notificationMenuVisible,accountMenuVisible:false,appMenuVisible:false,helpMenuVisible:false });
|
||||||
}
|
}
|
||||||
case appCommonActions.TOGGLEHELPMENU: {
|
case appCommonActions.TOGGLEHELPMENU: {
|
||||||
return tassign(state, { helpMenuVisible : !state.helpMenuVisible,accountMenuVisible:false,appMenuVisible:false,notificationMenuVisible:false,settingMenuVisible:false });
|
return tassign(state, { helpMenuVisible : !state.helpMenuVisible,accountMenuVisible:false,appMenuVisible:false,notificationMenuVisible:false });
|
||||||
}
|
|
||||||
case appCommonActions.TOGGLESETTINGMENU: {
|
|
||||||
return tassign(state, { settingMenuVisible : !state.settingMenuVisible,accountMenuVisible:false,appMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false });
|
|
||||||
}
|
}
|
||||||
case appCommonActions.ESCAPE: {
|
case appCommonActions.ESCAPE: {
|
||||||
return tassign(state, { menuVisible: false,accountMenuVisible:false,appMenuVisible: false,notificationMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
|
return tassign(state, { menuVisible: false,accountMenuVisible:false,appMenuVisible: false,notificationMenuVisible:false,helpMenuVisible:false });
|
||||||
}
|
}
|
||||||
case appCommonActions.SETMENUVISIBLE: {
|
case appCommonActions.SETMENUVISIBLE: {
|
||||||
const a = action as appCommonActions.SetMenuVisible;
|
const a = action as appCommonActions.SetMenuVisible;
|
||||||
return tassign(state, { menuVisible: a.visible,accountMenuVisible:a.visible?false:state.accountMenuVisible,appMenuVisible:a.visible?false:state.appMenuVisible,notificationMenuVisible:a.visible?false:state.notificationMenuVisible,helpMenuVisible:a.visible?false:state.helpMenuVisible,settingMenuVisible:a.visible?false:state.settingMenuVisible });
|
return tassign(state, { menuVisible: a.visible,accountMenuVisible:a.visible?false:state.accountMenuVisible,appMenuVisible:a.visible?false:state.appMenuVisible,notificationMenuVisible:a.visible?false:state.notificationMenuVisible,helpMenuVisible:a.visible?false:state.helpMenuVisible });
|
||||||
}
|
}
|
||||||
case appCommonActions.INITUSERPACKAGESSUCCESS:{
|
case appCommonActions.INITUSERPACKAGESSUCCESS:{
|
||||||
const a = action as appCommonActions.InitUserPackagesSuccess;
|
const a = action as appCommonActions.InitUserPackagesSuccess;
|
||||||
@ -189,10 +180,6 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
|
|||||||
const a = action as appCommonActions.SetUnreadNotifications;
|
const a = action as appCommonActions.SetUnreadNotifications;
|
||||||
return tassign(state,{unreadNotifications:a.unread});
|
return tassign(state,{unreadNotifications:a.unread});
|
||||||
}
|
}
|
||||||
case appCommonActions.SETSETTINGMENUBACKGROUNDCOLOR: {
|
|
||||||
const a = action as appCommonActions.SetSettingMenuBackgroundColor;
|
|
||||||
return tassign(state,{settingMenuBackgroundColor:a.color});
|
|
||||||
}
|
|
||||||
default: {
|
default: {
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
@ -214,11 +201,9 @@ export const getAccountMenuVisible = (state: State) => state.accountMenuVisible;
|
|||||||
export const getAppMenuVisible = (state: State) => state.appMenuVisible;
|
export const getAppMenuVisible = (state: State) => state.appMenuVisible;
|
||||||
export const getNotificationMenuVisible = (state: State) => state.notificationMenuVisible;
|
export const getNotificationMenuVisible = (state: State) => state.notificationMenuVisible;
|
||||||
export const getHelpMenuVisible = (state: State) => state.helpMenuVisible;
|
export const getHelpMenuVisible = (state: State) => state.helpMenuVisible;
|
||||||
export const getSettingMenuVisible = (state: State) => state.settingMenuVisible;
|
|
||||||
export const getUnreadNotifications = (state: State) => state.unreadNotifications;
|
export const getUnreadNotifications = (state: State) => state.unreadNotifications;
|
||||||
export const getIsOnline = (state: State) => state.isOnline;
|
export const getIsOnline = (state: State) => state.isOnline;
|
||||||
export const getIsPageMode = (state: State) => state.isPageMode;
|
export const getIsPageMode = (state: State) => state.isPageMode;
|
||||||
export const getSettingMenuBackgroundColor = (state: State) => state.settingMenuBackgroundColor;
|
|
||||||
|
|
||||||
export const selectAppCommonState = createFeatureSelector<State>(MODULE_NAME);
|
export const selectAppCommonState = createFeatureSelector<State>(MODULE_NAME);
|
||||||
|
|
||||||
@ -240,9 +225,9 @@ export const SelectGetAccountMenuVisible = createSelector(selectAppCommonState,g
|
|||||||
export const SelectGetAppMenuVisible = createSelector(selectAppCommonState,getAppMenuVisible);
|
export const SelectGetAppMenuVisible = createSelector(selectAppCommonState,getAppMenuVisible);
|
||||||
export const SelectGetNotificationMenuVisible = createSelector(selectAppCommonState,getNotificationMenuVisible);
|
export const SelectGetNotificationMenuVisible = createSelector(selectAppCommonState,getNotificationMenuVisible);
|
||||||
export const SelectGetHelpMenuVisible = createSelector(selectAppCommonState,getHelpMenuVisible);
|
export const SelectGetHelpMenuVisible = createSelector(selectAppCommonState,getHelpMenuVisible);
|
||||||
export const SelectGetSettingMenuVisible = createSelector(selectAppCommonState,getSettingMenuVisible);
|
|
||||||
export const SelectgetUnreadNotifications = createSelector(selectAppCommonState,getUnreadNotifications);
|
export const SelectgetUnreadNotifications = createSelector(selectAppCommonState,getUnreadNotifications);
|
||||||
|
|
||||||
export const SelectGetIsOnline = createSelector(selectAppCommonState,getIsOnline);
|
export const SelectGetIsOnline = createSelector(selectAppCommonState,getIsOnline);
|
||||||
export const SelectGetIsPageMode = createSelector(selectAppCommonState,getIsPageMode);
|
export const SelectGetIsPageMode = createSelector(selectAppCommonState,getIsPageMode);
|
||||||
export const SelectGetSettingMenuBackgroundColor= createSelector(selectAppCommonState,getSettingMenuBackgroundColor);
|
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,9 @@
|
|||||||
import { HttpClient, HttpParams } from "@angular/common/http";
|
|
||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { IItem } from '../models/item';
|
import { IItem } from '../models/item';
|
||||||
import { IItemTask } from '../models/itemTask';
|
import { HttpClient, HttpParams } from "@angular/common/http";
|
||||||
import { IUser } from '../models/user';
|
|
||||||
import { AppConfig } from "../shared/app.config";
|
import { AppConfig } from "../shared/app.config";
|
||||||
import { ItemTypeService } from './itemtype.service';
|
import {ItemTypeService} from './itemtype.service';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
@ -44,24 +42,4 @@ export class AdminService {
|
|||||||
deleteItem(code: string): Observable<any> {
|
deleteItem(code: string): Observable<any> {
|
||||||
return this.httpClient.delete<any>(`${this.ApiEndpoint()}/api/v1/admin/${code}`);
|
return this.httpClient.delete<any>(`${this.ApiEndpoint()}/api/v1/admin/${code}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
getAllUsers(): Observable<IUser[]> {
|
|
||||||
return this.httpClient.get<IUser[]>(`${this.ApiEndpoint()}/api/v1/admin/users`);
|
|
||||||
}
|
|
||||||
|
|
||||||
postItemTask(item: IItem, task: IItemTask): Observable<IItemTask> {
|
|
||||||
return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
|
|
||||||
}
|
|
||||||
|
|
||||||
getAnalyseFolderOverview(): Observable<any> {
|
|
||||||
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/overview`);
|
|
||||||
}
|
|
||||||
|
|
||||||
getAnalyseFolderInfo(user: string): Observable<any> {
|
|
||||||
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/${user}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
getAnalyseFolderLog(): Observable<any> {
|
|
||||||
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/log`);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,11 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Router, Route, ActivatedRouteSnapshot, RouterStateSnapshot, UrlSegment, UrlTree } from '@angular/router';
|
import {
|
||||||
|
CanActivate, Router, CanLoad, Route, CanActivateChild ,
|
||||||
|
ActivatedRouteSnapshot,
|
||||||
|
RouterStateSnapshot,
|
||||||
|
UrlSegment,
|
||||||
|
UrlTree
|
||||||
|
} from '@angular/router';
|
||||||
|
|
||||||
|
|
||||||
import { Store } from '@ngrx/store';
|
import { Store } from '@ngrx/store';
|
||||||
@ -13,7 +19,7 @@ import * as appCommonReducer from '../reducers/app-common.reducer';
|
|||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class AuthGuard {
|
export class AuthGuard implements CanActivate, CanLoad, CanActivateChild {
|
||||||
|
|
||||||
constructor(private oauthService: OAuthService, private router: Router, private store: Store<appCommonReducer.State>) { }
|
constructor(private oauthService: OAuthService, private router: Router, private store: Store<appCommonReducer.State>) { }
|
||||||
|
|
||||||
|
|||||||
@ -1,29 +0,0 @@
|
|||||||
import { Injectable } from '@angular/core';
|
|
||||||
import { Observable, of } from 'rxjs';
|
|
||||||
import { IItem } from '../models/item';
|
|
||||||
import { HttpClient } from "@angular/common/http";
|
|
||||||
import { AppConfig } from "../shared/app.config";
|
|
||||||
import {ItemTypeService} from './itemtype.service';
|
|
||||||
|
|
||||||
@Injectable({
|
|
||||||
providedIn: 'root',
|
|
||||||
})
|
|
||||||
export class DownloadService {
|
|
||||||
constructor(public httpClient: HttpClient, public appConfig: AppConfig,private itemTypeService:ItemTypeService) {
|
|
||||||
}
|
|
||||||
|
|
||||||
ApiEndpoint() {
|
|
||||||
return this.appConfig.getConfig("apiEndPoint");
|
|
||||||
}
|
|
||||||
|
|
||||||
getData(itemCode: string): Observable<any> {
|
|
||||||
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/${itemCode}/data`);
|
|
||||||
}
|
|
||||||
|
|
||||||
getData2(item: IItem): Observable<any> {
|
|
||||||
if (item.size > 0) {
|
|
||||||
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/${item.code}/data`)
|
|
||||||
}
|
|
||||||
return of({});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -2,7 +2,7 @@ import {Injectable} from '@angular/core';
|
|||||||
import {Observable} from 'rxjs';
|
import {Observable} from 'rxjs';
|
||||||
import {IListItem} from '../models/list.item';
|
import {IListItem} from '../models/list.item';
|
||||||
import {IItem} from '../models/item';
|
import {IItem} from '../models/item';
|
||||||
import { HttpClient } from '@angular/common/http';
|
import {HttpClient} from '@angular/common/http';
|
||||||
import {AppConfig} from '../shared/app.config';
|
import {AppConfig} from '../shared/app.config';
|
||||||
import {ItemService} from './item.service';
|
import {ItemService} from './item.service';
|
||||||
|
|
||||||
@ -18,37 +18,33 @@ export class FolderService {
|
|||||||
return this.appConfig.getConfig("apiEndPoint");
|
return this.appConfig.getConfig("apiEndPoint");
|
||||||
}
|
}
|
||||||
|
|
||||||
getFolder(code: string): Observable<IListItem> {
|
getFolder(code: string): Observable<IListItem> {
|
||||||
return this.httpClient.get<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/${code}`);
|
return this.httpClient.get<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/${code}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
getMyRoot(): Observable<IListItem> {
|
getMyRoots(): Observable<IListItem[]> {
|
||||||
return this.httpClient.get<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/my_root`);
|
return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/my_roots`);
|
||||||
}
|
}
|
||||||
|
|
||||||
getMyRoots(): Observable<IListItem[]> {
|
getFolderParents(code: string): Observable<IListItem[]> {
|
||||||
return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/my_roots`);
|
return this.itemService.getBreadcrumbs(code);
|
||||||
}
|
}
|
||||||
|
|
||||||
getFolderParents(code: string): Observable<IListItem[]> {
|
getChildFolders(code: string): Observable<IListItem[]> {
|
||||||
return this.itemService.getBreadcrumbs(code);
|
const folderItemTypes = "FOLDER,FTP_FOLDER";
|
||||||
}
|
return this.itemService.getChildItemList(code, folderItemTypes);
|
||||||
|
}
|
||||||
|
|
||||||
getChildFolders(code: string): Observable<IListItem[]> {
|
getItems(code: string,skip:number, take:number): Observable<IListItem[]> {
|
||||||
const folderItemTypes = "FOLDER,FTP_FOLDER";
|
return this.itemService.getChildItemList(code, null, null, 1, true, null, null, skip, take);
|
||||||
return this.itemService.getChildItemList(code, folderItemTypes);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
getItems(code: string,skip:number, take:number): Observable<IListItem[]> {
|
moveItem(itemCode: string, newParentCode: string): Observable<IListItem> {
|
||||||
return this.itemService.getChildItemList(code, null, null, 1, true, null, null, skip, take);
|
const body = { itemCode: itemCode,newParentCode: newParentCode };
|
||||||
}
|
return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/items/move`, body);
|
||||||
|
}
|
||||||
|
|
||||||
moveItem(itemCode: string, newParentCode: string): Observable<IListItem> {
|
createFolder(folder: IItem): Observable<IListItem> {
|
||||||
const body = { itemCode: itemCode,newParentCode: newParentCode };
|
return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/`, folder);
|
||||||
return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/items/move`, body);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
createFolder(folder: IItem): Observable<IListItem> {
|
|
||||||
return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/`, folder);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
|
import { CanActivate, CanActivateChild, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
|
||||||
|
|
||||||
import { Store } from '@ngrx/store';
|
import { Store } from '@ngrx/store';
|
||||||
|
|
||||||
@ -10,7 +10,7 @@ import * as appCommonActions from '../actions/app-common.actions';
|
|||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class FullScreenGuard {
|
export class FullScreenGuard implements CanActivate,CanActivateChild {
|
||||||
|
|
||||||
private loginDispatched = false;
|
private loginDispatched = false;
|
||||||
constructor(private store: Store<appCommonReducer.State> ) { }
|
constructor(private store: Store<appCommonReducer.State> ) { }
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { IUser } from '../models/user';
|
import { IUser } from '../models/user';
|
||||||
import { HttpClient, HttpHeaders } from "@angular/common/http";
|
import { HttpClient,HttpHeaders } from "@angular/common/http";
|
||||||
import { AppConfig } from "../shared/app.config";
|
import { AppConfig } from "../shared/app.config";
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { IUser } from '../models/user';
|
import { IUser } from '../models/user';
|
||||||
import { HttpClient, HttpHeaders } from "@angular/common/http";
|
import { HttpClient,HttpHeaders } from "@angular/common/http";
|
||||||
import { AppConfig } from "../shared/app.config";
|
import { AppConfig } from "../shared/app.config";
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user