Compare commits
No commits in common. "develop" and "AW-4620" have entirely different histories.
22
.eslintrc.js
22
.eslintrc.js
@ -1,22 +0,0 @@
|
||||
module.exports = {
|
||||
"env": {
|
||||
"browser": true,
|
||||
"es2021": true
|
||||
},
|
||||
"extends": [
|
||||
"eslint:recommended",
|
||||
"plugin:@typescript-eslint/recommended"
|
||||
],
|
||||
"overrides": [
|
||||
],
|
||||
"parser": "@typescript-eslint/parser",
|
||||
"parserOptions": {
|
||||
"ecmaVersion": "latest",
|
||||
"sourceType": "module"
|
||||
},
|
||||
"plugins": [
|
||||
"@typescript-eslint"
|
||||
],
|
||||
"rules": {
|
||||
}
|
||||
}
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -49,7 +49,3 @@ Thumbs.db
|
||||
projects/common/node_modules/
|
||||
projects/common-map/node_modules/
|
||||
.angular/*
|
||||
projects/common-map3d/node_modules/
|
||||
projects/common-map/node_modules/
|
||||
projects/ng-openlayers/node_modules/
|
||||
projects/common/node_modules/
|
||||
|
||||
54
Jenkinsfile
vendored
54
Jenkinsfile
vendored
@ -1,24 +1,54 @@
|
||||
@Library('farmmaps-shared-library') _
|
||||
|
||||
pipeline {
|
||||
agent any;
|
||||
options {
|
||||
copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
|
||||
disableConcurrentBuilds();
|
||||
agent any
|
||||
environment {
|
||||
PACKAGE_VERSION_PREFIX=sh(script: 'jq .version package.json |sed "s/\\"//g"', returnStdout: true).trim()
|
||||
PACKAGE_VERSION="${PACKAGE_VERSION_PREFIX}"
|
||||
}
|
||||
stages {
|
||||
stage('FarmmapsLibBuildAll') {
|
||||
stage('npm install'){
|
||||
steps {
|
||||
stepFarmmapsLibBuildAll();
|
||||
sh '''rm -rf node_modules/
|
||||
npm install --legacy-peer-deps
|
||||
cd projects/common
|
||||
npm install --legacy-peer-deps
|
||||
cd ../common-map
|
||||
npm install --legacy-peer-deps
|
||||
cd ../common-map3d
|
||||
npm install --legacy-peer-deps
|
||||
'''
|
||||
}
|
||||
}
|
||||
stage('build'){
|
||||
steps {
|
||||
sh '''ng build common --configuration production
|
||||
ng build common-map --configuration production
|
||||
ng build common-map3d --configuration production'''
|
||||
}
|
||||
}
|
||||
stage('npm publish'){
|
||||
steps {
|
||||
sh '''cd dist/common
|
||||
npm version ${PACKAGE_VERSION} --allow-same-version
|
||||
npm publish
|
||||
cd ../common-map
|
||||
npm version ${PACKAGE_VERSION} --allow-same-version
|
||||
npm publish
|
||||
cd ../common-map3d
|
||||
npm version ${PACKAGE_VERSION} --allow-same-version
|
||||
npm publish'''
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
post {
|
||||
success {
|
||||
postSuccess();
|
||||
}
|
||||
always {
|
||||
postAlways();
|
||||
emailext (
|
||||
body: '${DEFAULT_CONTENT}',
|
||||
mimeType: 'text/html',
|
||||
replyTo: '${DEFAULT_REPLYTO}',
|
||||
subject: '${DEFAULT_SUBJECT}',
|
||||
to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,24 +1,54 @@
|
||||
@Library('farmmaps-shared-library') _
|
||||
|
||||
pipeline {
|
||||
agent any;
|
||||
options {
|
||||
copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
|
||||
disableConcurrentBuilds();
|
||||
agent any
|
||||
environment {
|
||||
PACKAGE_VERSION_PREFIX=sh(script: 'jq .version package.json |sed "s/\\"//g"', returnStdout: true).trim()
|
||||
PACKAGE_VERSION="${PACKAGE_VERSION_PREFIX + '-prerelease.' + env.BUILD_NUMBER}"
|
||||
}
|
||||
stages {
|
||||
stage('FarmmapsLibBuildAll') {
|
||||
stage('npm install'){
|
||||
steps {
|
||||
stepFarmmapsLibBuildAll();
|
||||
sh '''rm -rf node_modules/
|
||||
npm install --legacy-peer-deps
|
||||
cd projects/common
|
||||
npm install --legacy-peer-deps
|
||||
cd ../common-map
|
||||
npm install --legacy-peer-deps
|
||||
cd ../common-map3d
|
||||
npm install --legacy-peer-deps
|
||||
'''
|
||||
}
|
||||
}
|
||||
stage('build'){
|
||||
steps {
|
||||
sh '''ng build common --configuration production
|
||||
ng build common-map --configuration production
|
||||
ng build common-map3d --configuration production'''
|
||||
}
|
||||
}
|
||||
stage('npm publish'){
|
||||
steps {
|
||||
sh '''cd dist/common
|
||||
npm version ${PACKAGE_VERSION}
|
||||
npm publish
|
||||
cd ../common-map
|
||||
npm version ${PACKAGE_VERSION}
|
||||
npm publish
|
||||
cd ../common-map3d
|
||||
npm version ${PACKAGE_VERSION}
|
||||
npm publish'''
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
post {
|
||||
success {
|
||||
postSuccess();
|
||||
}
|
||||
always {
|
||||
postAlways();
|
||||
emailext (
|
||||
body: '${DEFAULT_CONTENT}',
|
||||
mimeType: 'text/html',
|
||||
replyTo: '${DEFAULT_REPLYTO}',
|
||||
subject: '${DEFAULT_SUBJECT}',
|
||||
to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
11
README.md
11
README.md
@ -2,6 +2,7 @@
|
||||
|
||||
This is a sample FarmMaps client in Angular 7.x.
|
||||
|
||||
|
||||
## Quick start
|
||||
|
||||
Use one of the two options below to get started.
|
||||
@ -50,15 +51,9 @@ npm install -g @angular/cli
|
||||
npm install
|
||||
ng serve
|
||||
```
|
||||
*Go*`
|
||||
*Go*
|
||||
|
||||
Point your browser to http://localhost:4200
|
||||
|
||||
*ESLint*
|
||||
|
||||
```
|
||||
npm run lint src
|
||||
npm run lint projects/common/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": {
|
||||
"tsConfig": "projects/common-map/tsconfig.lib.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": {
|
||||
"builder": "@angular-devkit/build-angular:karma",
|
||||
"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": {
|
||||
|
||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 143 KiB After Width: | Height: | Size: 73 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -51,17 +51,7 @@
|
||||
content: "i";
|
||||
}
|
||||
|
||||
.fm-carbon:before {
|
||||
content: "j";
|
||||
}
|
||||
|
||||
.fm-bo-akkerbouw:before {
|
||||
content: "k";
|
||||
}
|
||||
|
||||
.fm-grass:before {
|
||||
content: "l";
|
||||
}
|
||||
hallo
|
||||
|
||||
@font-face {
|
||||
font-family: "FarmMaps";
|
||||
|
||||
26436
package-lock.json
generated
26436
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
90
package.json
90
package.json
@ -1,83 +1,72 @@
|
||||
{
|
||||
"name": "farmmaps-lib-app",
|
||||
"version": "4.12.0",
|
||||
"scripts": {
|
||||
"version": "3.0.1",
|
||||
"scripts": {
|
||||
"ng": "ng",
|
||||
"start": "ng serve",
|
||||
"build": "ng build",
|
||||
"test": "ng test",
|
||||
"lint": "eslint -c .eslintrc.js --ext .ts",
|
||||
"lint": "ng lint",
|
||||
"e2e": "ng e2e"
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular-eslint/eslint-plugin": "^18.2.0",
|
||||
"@angular/animations": "^18.2.3",
|
||||
"@angular/common": "^18.2.3",
|
||||
"@angular/compiler": "^18.2.3",
|
||||
"@angular/core": "^18.2.3",
|
||||
"@angular/forms": "^18.2.3",
|
||||
"@angular/platform-browser": "^18.2.3",
|
||||
"@angular/platform-browser-dynamic": "^18.2.3",
|
||||
"@angular/router": "^18.2.3",
|
||||
"dependencies": {
|
||||
"@angular/animations": "^14.1.3",
|
||||
"@angular/common": "^14.1.3",
|
||||
"@angular/compiler": "^14.1.3",
|
||||
"@angular/core": "^14.1.3",
|
||||
"@angular/forms": "^14.1.3",
|
||||
"@angular/platform-browser": "^14.1.3",
|
||||
"@angular/platform-browser-dynamic": "^14.1.3",
|
||||
"@angular/router": "^14.1.3",
|
||||
"@farmmaps/common": "file:dist/common",
|
||||
"@farmmaps/common-map": "file:dist/common-map",
|
||||
"@farmmaps/common-map3d": "file:dist/common-map3d",
|
||||
"@farmmaps/ng-openlayers": "file:dist/ng-openlayers",
|
||||
"@microsoft/signalr": "^3.1.16",
|
||||
"@ng-bootstrap/ng-bootstrap": "^17.0.1",
|
||||
"@ngrx/effects": "^18.0.2",
|
||||
"@ngrx/router-store": "^18.0.2",
|
||||
"@ngrx/store": "^18.0.2",
|
||||
"@popperjs/core": "^2.11.8",
|
||||
"angular-oauth2-oidc": "^17.0.2",
|
||||
"@ng-bootstrap/ng-bootstrap": "^13.0.0",
|
||||
"@ngrx/effects": "^14",
|
||||
"@ngrx/router-store": "^14",
|
||||
"@ngrx/store": "^14",
|
||||
"@popperjs/core": "^2.11.6",
|
||||
"angular-oauth2-oidc": "^13",
|
||||
"assert": "^2.0.0",
|
||||
"bootstrap": "^5.3.3",
|
||||
"bootstrap": "^5.2.0",
|
||||
"browserify-zlib": "^0.2.0",
|
||||
"buffer": "^6.0.3",
|
||||
"cesium": "^1.97.0",
|
||||
"core-js": "^2.6.12",
|
||||
"https-browserify": "^1.0.0",
|
||||
"moment": "^2.29.4",
|
||||
"ngrx-store-localstorage": "^18.0.0",
|
||||
"ngx-avatars": "^1.8.0",
|
||||
"ngx-clipboard": "^16.0.0",
|
||||
"ngx-image-cropper": "^7.0.0",
|
||||
"ngx-uploadx": "^6.2.0",
|
||||
"ol": "^8.2.0",
|
||||
"ngrx-store-localstorage": "^14",
|
||||
"ngx-avatar": "^4.1.0",
|
||||
"ngx-clipboard": "^14.0.1",
|
||||
"ngx-image-cropper": "^3.3.5",
|
||||
"ngx-openlayers": "1.0.0-next.19",
|
||||
"ngx-uploadx": "^5.2.0",
|
||||
"ol": "6.14.1",
|
||||
"olcs": "^2.13.1",
|
||||
"resumablejs": "^1.1.0",
|
||||
"rxjs": "^7.8.1",
|
||||
"rxjs": "^6.6.7",
|
||||
"stream": "^0.0.2",
|
||||
"stream-http": "^3.2.0",
|
||||
"tassign": "^1.0.0",
|
||||
"tslib": "^2.4.0",
|
||||
"url": "^0.11.0",
|
||||
"util": "^0.12.4",
|
||||
"zone.js": "~0.14.10"
|
||||
"zone.js": "~0.11.4"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@lmdb/lmdb-linux-x64": "^3.1.0",
|
||||
"@rollup/rollup-linux-x64-gnu": "^4.21.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-builders/custom-webpack": "^18.0.0",
|
||||
"@angular-devkit/build-angular": "^18.2.3",
|
||||
"@angular/cli": "^18.2.3",
|
||||
"@angular/compiler-cli": "^18.2.3",
|
||||
"@angular/language-service": "^18.2.3",
|
||||
"@angular/localize": "^18.2.3",
|
||||
"devDependencies": {
|
||||
"@angular-builders/custom-webpack": "^14",
|
||||
"@angular-devkit/build-angular": "^14.1.3",
|
||||
"@angular/cli": "^14.1.3",
|
||||
"@angular/compiler-cli": "^14.1.3",
|
||||
"@angular/language-service": "^14.1.3",
|
||||
"@angular/localize": "^14.1.3",
|
||||
"@types/arcgis-rest-api": "^10.4.5",
|
||||
"@types/jasmine": "~2.8.8",
|
||||
"@types/jasminewd2": "^2.0.9",
|
||||
"@types/node": "^22.5.4",
|
||||
"@typescript-eslint/eslint-plugin": "^6.18.0",
|
||||
"@typescript-eslint/eslint-plugin-tslint": "^6.18.0",
|
||||
"@typescript-eslint/parser": "^6.18.0",
|
||||
"codelyzer": "^6.0.2",
|
||||
"eslint": "^8.35.0",
|
||||
"eslint-config-prettier": "^8.6.0",
|
||||
"eslint-plugin-import": "^2.27.5",
|
||||
"@types/node": "^12.20.15",
|
||||
"codelyzer": "^0.0.28",
|
||||
"jasmine-core": "^4.3.0",
|
||||
"jasmine-spec-reporter": "^7.0.0",
|
||||
"karma": "^6.3.20",
|
||||
@ -85,9 +74,10 @@
|
||||
"karma-coverage-istanbul-reporter": "^3.0.3",
|
||||
"karma-jasmine": "^5.1.0",
|
||||
"karma-jasmine-html-reporter": "^2.0.0",
|
||||
"ng-packagr": "^18.2.1",
|
||||
"ng-packagr": "^14.1.0",
|
||||
"protractor": "~7.0.0",
|
||||
"ts-node": "^8.8.1",
|
||||
"typescript": "~5.4.4"
|
||||
"tslint": "~6.1.0",
|
||||
"typescript": "~4.6.4"
|
||||
}
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
module.exports = {
|
||||
"env": {
|
||||
"browser": true,
|
||||
"es2021": true
|
||||
},
|
||||
"extends": [
|
||||
"eslint:recommended",
|
||||
"plugin:@typescript-eslint/recommended"
|
||||
],
|
||||
"overrides": [
|
||||
],
|
||||
"parser": "@typescript-eslint/parser",
|
||||
"parserOptions": {
|
||||
"ecmaVersion": "latest",
|
||||
"sourceType": "module"
|
||||
},
|
||||
"plugins": [
|
||||
"@typescript-eslint"
|
||||
],
|
||||
"rules": {
|
||||
}
|
||||
}
|
||||
218
projects/common-map/package-lock.json
generated
218
projects/common-map/package-lock.json
generated
@ -1,217 +1,13 @@
|
||||
{
|
||||
"name": "@farmmaps/common-map",
|
||||
"version": "2.0.0",
|
||||
"lockfileVersion": 3,
|
||||
"version": "0.0.1",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@farmmaps/common-map",
|
||||
"version": "2.0.0",
|
||||
"dependencies": {
|
||||
"tslib": "^2.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@angular/core": "^18.2.3",
|
||||
"@ngrx/effects": "^18.0.2",
|
||||
"@ngrx/router-store": "^18.0.2",
|
||||
"@ngrx/store": "^18.0.2",
|
||||
"ngrx-store-localstorage": "^18",
|
||||
"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": {
|
||||
"version": "2.7.0",
|
||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
|
||||
"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
|
||||
},
|
||||
"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
|
||||
"dependencies": {
|
||||
"tslib": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
|
||||
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,11 +8,13 @@
|
||||
"tslib": "^2.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@angular/core": "^18.2.3",
|
||||
"ngrx-store-localstorage": "^18.0.0",
|
||||
"@ngrx/effects": "^18.0.2",
|
||||
"@ngrx/router-store": "^18.0.2",
|
||||
"@ngrx/store": "^18.0.2",
|
||||
"tassign": "^1.0.0"
|
||||
"@angular/core": ">=14.0.0",
|
||||
"ngrx-store-localstorage": ">=14.0.0",
|
||||
"@ngrx/effects": ">=14.0.0",
|
||||
"@ngrx/router-store":">=14.0.0",
|
||||
"@ngrx/store":">=14.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 STARTSEARCH = '[Map] StartSearch';
|
||||
export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
|
||||
export const CLICKFEATURE = '[Map] ClickFeature';
|
||||
export const SELECTFEATURE = '[Map] SelectFeature';
|
||||
export const SELECTITEM = '[Map] SelectItem';
|
||||
export const SELECTITEMSUCCESS = '[Map] SelectItemSuccess';
|
||||
@ -57,8 +56,7 @@ export const GETLAYERVALUE = '[Map] GetLayerValue'
|
||||
export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
|
||||
export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
|
||||
export const SETVIEWSTATE = '[Map] SetViewState'
|
||||
export const CLEARFEATURES = '[Map] ClearFeatures';
|
||||
export const SETPANELEXTRAWIDE = '[Map] SetPanelExtraWide';
|
||||
|
||||
|
||||
export class Clear implements Action {
|
||||
readonly type = CLEAR;
|
||||
@ -113,12 +111,6 @@ export class StartSearchSuccess implements Action {
|
||||
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 {
|
||||
readonly type = SELECTFEATURE;
|
||||
|
||||
@ -337,23 +329,12 @@ export class SetViewState implements Action {
|
||||
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
|
||||
| Init
|
||||
| Clear
|
||||
| SetParent
|
||||
| StartSearch
|
||||
| StartSearchSuccess
|
||||
| ClickFeature
|
||||
| SelectFeature
|
||||
| SelectItem
|
||||
| SelectItemSuccess
|
||||
@ -393,7 +374,5 @@ export type Actions = SetMapState
|
||||
| GetLayerValue
|
||||
| SetPeriod
|
||||
| ToggleShowDataLayerSlide
|
||||
| SetViewState
|
||||
| ClearFeatures
|
||||
| SetPanelExtraWide;
|
||||
| SetViewState;
|
||||
|
||||
|
||||
@ -1,91 +1,91 @@
|
||||
import { NgModule ,ModuleWithProviders} from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { NgModule } from '@angular/core';
|
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||
|
||||
//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 { ActionReducer, MetaReducer, StoreModule } from '@ngrx/store';
|
||||
import { AngularOpenlayersModule } from '@farmmaps/ng-openlayers';
|
||||
import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
|
||||
|
||||
//common modules
|
||||
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 * 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 { IItemLayer, ItemLayer, ITemporalItemLayer, TemporalItemLayer } from './models/item.layer';
|
||||
import { IMapState } from './models/map.state';
|
||||
import { IPeriodState } from './models/period.state';
|
||||
import { IMapState} from './models/map.state';
|
||||
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
|
||||
import { MapRoutingModule } from './common-map-routing.module';
|
||||
import { FileDropTargetComponent } from './components/aol/file-drop-target/file-drop-target.component';
|
||||
import { GpsLocation } from './components/aol/gps-location/gps-location.component';
|
||||
import { ItemLayersComponent } from './components/aol/item-layers/item-layers.component';
|
||||
import { ItemVectorSourceComponent } from './components/aol/item-vector-source/item-vector-source.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 { GpsLocation} from './components/aol/gps-location/gps-location.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 { ItemWidgetListComponent} from './components/item-widget-list/item-widget-list.component';
|
||||
import { AbstractItemListItemComponent, ItemListItemComponent, AbstractItemWidgetComponent } from './components/item-list-item/item-list-item.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 { 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 { AbstractItemListComponent,ItemListComponent} from './components/item-list/item-list.component';
|
||||
import { AbstractSelectedItemComponent, SelectedItemComponent } from './components/selected-item/selected-item.component';
|
||||
import { SelectedItemCropfieldComponent } from './components/selected-item-cropfield/selected-item-cropfield.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 { AbstractSelectedItemComponent, SelectedItemComponent } from './components/selected-item/selected-item.component';
|
||||
import { WidgetHostDirective } from './components/widget-host/widget-host.directive';
|
||||
import { WidgetStatusComponent } from './components/widget-status/widget-status.component';
|
||||
import { ZoomToShowAlert } from './components/zoom-to-show-alert/zoom-to-show-alert.component';
|
||||
import { DeviceOrientationService } from './services/device-orientation.service';
|
||||
import { FeatureIconService } from './services/feature-icon.service';
|
||||
import { SelectedItemTemporalComponent} from './components/selected-item-temporal/selected-item-temporal.component';
|
||||
import {SelectedItemShapeComponent } from './components/selected-item-shape/selected-item-shape.component';
|
||||
import { SelectedItemContainerComponent } from './components/selected-item-container/selected-item-container.component';
|
||||
import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from './components/feature-list-feature/feature-list-feature.component';
|
||||
import {FeatureListFeatureContainerComponent } from './components/feature-list-feature-container/feature-list-feature-container.component';
|
||||
import { FeatureListCroppingschemeComponent } from './components/feature-list-croppingscheme/feature-list-croppingscheme.component';
|
||||
import {FeatureListCropfieldComponent } from './components/feature-list-cropfield/feature-list-cropfield.component';
|
||||
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 { 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> {
|
||||
const r = function(state, action) {
|
||||
const r2 = reducer(state, action);
|
||||
|
||||
if(action.type == "@ngrx/store/update-reducers") {
|
||||
const ms = window.localStorage.getItem(MODULE_NAME+"_mapState");
|
||||
let ms = window.localStorage.getItem(MODULE_NAME+"_mapState");
|
||||
if(ms) {
|
||||
r2["mapState"] = JSON.parse(ms);
|
||||
}
|
||||
const sp = window.localStorage.getItem(MODULE_NAME+"_searchPeriod");
|
||||
let sp = window.localStorage.getItem(MODULE_NAME+"_searchPeriod");
|
||||
if(sp) {
|
||||
const p = JSON.parse(sp);
|
||||
let p = JSON.parse(sp);
|
||||
r2["period"] = { startDate: new Date(Date.parse(p.startDate)),endDate:new Date(Date.parse(p.endDate))};
|
||||
}
|
||||
}
|
||||
@ -104,13 +104,70 @@ export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any
|
||||
const metaReducers: Array<MetaReducer<any, any>> = [LocalStorageSync];
|
||||
|
||||
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,
|
||||
AbstractFeatureListFeatureComponent, AbstractItemListComponent, AbstractItemListItemComponent, AbstractItemWidgetComponent, AbstractSelectedItemComponent, DeviceOrientationService, FeatureIconService, FeatureListComponent, FeatureListContainerComponent, FeatureListCropfieldComponent, FeatureListCroppingschemeComponent, FeatureListFeatureComponent, FeatureListFeatureContainerComponent, FeatureListFeatureCropfieldComponent, FeatureListFeatureCroppingschemeComponent, FileDropTargetComponent, ForChild,
|
||||
ForItemType, ForPackage, ForSourceTask, GeolocationService, GeometryThumbnailComponent, GpsLocation, IClickedFeature, ifZoomToShowDirective, IItemLayer, IMapState, IPeriodState, ISelectedFeatures, ItemLayer, ItemLayersComponent, ItemListComponent, ItemListItemComponent,
|
||||
ItemListItemContainerComponent, ITemporalItemLayer, ItemVectorSourceComponent, ItemWidgetListComponent, LayerListComponent, LayerSwitcher, LayerVectorImageComponent, LegendComponent, mapActions, MapComponent, mapEffects,
|
||||
mapReducers, MapSearchComponent, MetaDataModalComponent, PanToLocation, RotationResetComponent, SelectedItemComponent, SelectedItemContainerComponent, SelectedItemCropfieldComponent,
|
||||
SelectedItemGeotiffComponent, SelectedItemShapeComponent, SelectedItemTemporalComponent, SelectPeriodModalComponent, TemporalItemLayer, TemporalService, WidgetHostDirective, WidgetStatusComponent, ZoomToExtentComponent, ZoomToShowAlert
|
||||
};
|
||||
AbstractFeatureListFeatureComponent,
|
||||
AbstractSelectedItemComponent,
|
||||
AbstractItemWidgetComponent,
|
||||
AbstractItemListItemComponent,
|
||||
AbstractItemListComponent,
|
||||
FeatureIconService,
|
||||
GeolocationService,
|
||||
DeviceOrientationService,
|
||||
TemporalService,
|
||||
IMapState,
|
||||
ISelectedFeatures,
|
||||
IItemLayer,
|
||||
ItemLayer,
|
||||
IPeriodState,
|
||||
ForChild,
|
||||
ForItemType,
|
||||
ForSourceTask,
|
||||
ForPackage ,
|
||||
ITemporalItemLayer,
|
||||
TemporalItemLayer,
|
||||
ifZoomToShowDirective,
|
||||
ZoomToShowAlert,
|
||||
IClickedFeature,
|
||||
GeometryThumbnailComponent
|
||||
}
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
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 {Point,Geometry} from 'ol/geom';
|
||||
@ -28,7 +28,7 @@ export class FileDropTargetComponent implements OnInit, OnDestroy {
|
||||
|
||||
ngOnInit() {
|
||||
this.element = this.map.instance.getViewport();
|
||||
const other = this;
|
||||
let other = this;
|
||||
this.element.addEventListener('drop', this.onDrop, false);
|
||||
this.element.addEventListener('dragover', this.preventDefault, false);
|
||||
this.element.addEventListener('dragenter', this.preventDefault, false);
|
||||
@ -36,20 +36,20 @@ export class FileDropTargetComponent implements OnInit, OnDestroy {
|
||||
|
||||
private onDrop = (event: DragEvent) => {
|
||||
this.stopEvent(event);
|
||||
const geojsonFormat = new GeoJSON();
|
||||
let parentCode = this.parentCode;
|
||||
const coordinate = this.map.instance.getEventCoordinate(event);
|
||||
let geojsonFormat = new GeoJSON();
|
||||
var parentCode = this.parentCode;
|
||||
var coordinate = this.map.instance.getEventCoordinate(event);
|
||||
//coordinate = proj.transform(coordinate, this.map.instance.getView().getProjection(), 'EPSG:4326');
|
||||
let geometry:Geometry = new Point(coordinate);
|
||||
const hitFeatures = this.map.instance.getFeaturesAtPixel([event.pageX, event.pageY]);
|
||||
const hitFeature = hitFeatures && hitFeatures.length > 0 ? hitFeatures[0] : null;
|
||||
var geometry:Geometry = new Point(coordinate);
|
||||
var hitFeatures = this.map.instance.getFeaturesAtPixel([event.pageX, event.pageY]);
|
||||
var hitFeature = hitFeatures && hitFeatures.length > 0 ? hitFeatures[0] : null;
|
||||
if (hitFeature) {
|
||||
if (hitFeature.get("code")) {
|
||||
parentCode = hitFeature.get("code");
|
||||
}
|
||||
geometry = geojsonFormat.readGeometry(geojsonFormat.writeGeometry(geometry)); // create copy instead of reference
|
||||
}
|
||||
const projectedGeometry = geometry.transform(this.map.instance.getView().getProjection(), 'EPSG:4326');
|
||||
var projectedGeometry = geometry.transform(this.map.instance.getView().getProjection(), 'EPSG:4326');
|
||||
|
||||
if (event.dataTransfer && event.dataTransfer.files) {
|
||||
this.onFileDropped.emit({ files: event.dataTransfer.files, event: event, geometry: JSON.parse(geojsonFormat.writeGeometry(projectedGeometry)),parentCode:parentCode})
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
|
||||
.gps-location {
|
||||
display:none;
|
||||
}
|
||||
@ -11,7 +14,7 @@
|
||||
}
|
||||
|
||||
.tolerance {
|
||||
fill: var(--bs-primary);
|
||||
fill: $primary;
|
||||
fill-opacity:0.4;
|
||||
}
|
||||
|
||||
@ -20,20 +23,20 @@
|
||||
}
|
||||
|
||||
.border {
|
||||
fill: var(--bs-white);
|
||||
fill: $white;
|
||||
}
|
||||
|
||||
.center {
|
||||
fill: var(--bs-primary);
|
||||
fill: $primary;
|
||||
}
|
||||
|
||||
.stop1 {
|
||||
stop-color: var(--bs-primary);
|
||||
stop-color: $primary;
|
||||
stop-opacity:1;
|
||||
}
|
||||
|
||||
.stop2 {
|
||||
stop-color:var(--bs-primary);
|
||||
stop-color:$primary;
|
||||
stop-opacity: 0;
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
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 { fromLonLat, toLonLat } from 'ol/proj';
|
||||
|
||||
@ -15,16 +15,16 @@ export class GpsLocation implements OnInit,OnChanges{
|
||||
public instance: Overlay;
|
||||
@Input() position: GeolocationPosition;
|
||||
@Input() location: number[]=[0,0];
|
||||
@Input() locationTolerance = 0;
|
||||
@Input() showHeading = false;
|
||||
@Input() showTolerance = false;
|
||||
@Input() heading = 0;
|
||||
@Input() headingTolerance = 0;
|
||||
public locTolerancePixels = 0;
|
||||
public path = "";
|
||||
public rotate = "";
|
||||
private resolution = 0;
|
||||
initialized = false;
|
||||
@Input() locationTolerance: number = 0;
|
||||
@Input() showHeading: boolean = false;
|
||||
@Input() showTolerance: boolean = false;
|
||||
@Input() heading: number = 0;
|
||||
@Input() headingTolerance: number = 0;
|
||||
public locTolerancePixels: number = 0;
|
||||
public path: string = "";
|
||||
public rotate: string = "";
|
||||
private resolution: number = 0;
|
||||
initialized:boolean = false;
|
||||
@ViewChild('location', { static: true }) locationElement: ElementRef;
|
||||
|
||||
constructor(private map: MapComponent) {
|
||||
@ -42,12 +42,12 @@ export class GpsLocation implements OnInit,OnChanges{
|
||||
position: fromLonLat( this.location),
|
||||
element: this.locationElement.nativeElement
|
||||
});
|
||||
const x = Math.tan(this.headingTolerance * Math.PI / 180)*40;
|
||||
const y = Math.cos(this.headingTolerance * Math.PI / 180) * 40;
|
||||
const y1 = Math.round(500 - y);
|
||||
const x1 = Math.round(500 - x);
|
||||
const y2 = Math.round(y1);
|
||||
const x2 = Math.round(500 + x);
|
||||
var x = Math.tan(this.headingTolerance * Math.PI / 180)*40;
|
||||
var y = Math.cos(this.headingTolerance * Math.PI / 180) * 40;
|
||||
var y1 = Math.round(500 - y);
|
||||
var x1 = Math.round(500 - x);
|
||||
var y2 = Math.round(y1);
|
||||
var x2 = Math.round(500 + x);
|
||||
this.path = "M " + x2 + " " + y2 + " A 45 45,0,0,0, " + x1 + " " + y1 + " L 493 500 L 507 500 Z";
|
||||
this.rotate = "rotate(" + Math.round(this.heading) + " 500 500)";
|
||||
this.locTolerancePixels = this.locationTolerance;
|
||||
@ -61,7 +61,7 @@ export class GpsLocation implements OnInit,OnChanges{
|
||||
|
||||
ngOnChanges(changes: SimpleChanges) {
|
||||
if (changes.position && this.instance) {
|
||||
const p = changes.position.currentValue as GeolocationPosition;
|
||||
var p = changes.position.currentValue as GeolocationPosition;
|
||||
if(p && this.initialized) {
|
||||
this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
|
||||
this.locationTolerance = p.coords.accuracy;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
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 { IItemLayer, ITemporalItemLayer} from '../../../models/item.layer';
|
||||
import { ILayerData} from '../../../models/layer.data';
|
||||
@ -19,7 +19,6 @@ import VectorTileLayer from 'ol/layer/VectorTile';
|
||||
import {GeoJSON,MVT} from 'ol/format';
|
||||
import { Geometry } from 'ol/geom';
|
||||
import BaseLayer from 'ol/layer/Base';
|
||||
import Feature from 'ol/Feature';
|
||||
|
||||
@Component({
|
||||
selector: 'fm-map-item-layers',
|
||||
@ -36,7 +35,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
@Output() onFeatureHover: EventEmitter<any> = new EventEmitter<any>();
|
||||
@Output() onPrerender: EventEmitter<any> = new EventEmitter<any>();
|
||||
private _apiEndPoint: string;
|
||||
private initialized = false;
|
||||
private initialized:boolean = false;
|
||||
private mapEventHandlerInstalled = false;
|
||||
private topLayerPrerenderEventhandlerInstalled = false;
|
||||
private selectedFeatures = {};
|
||||
@ -50,7 +49,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
private styleCache = {}
|
||||
|
||||
componentToHex(c) {
|
||||
const hex = c.toString(16);
|
||||
var hex = c.toString(16);
|
||||
return hex.length == 1 ? "0" + hex : hex;
|
||||
}
|
||||
|
||||
@ -59,28 +58,28 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
}
|
||||
|
||||
getColorFromGradient(layer: ILayer, value: number): IColor {
|
||||
const gradient: IGradientstop[] = layer.renderer.colorMap.gradient;
|
||||
const histogram: IHistogram = layer.renderer.band.histogram;
|
||||
const index = (value - histogram.min) / histogram.max;
|
||||
let min = gradient[0];
|
||||
let max = gradient[gradient.length - 1];
|
||||
for (let n = 0; n < gradient.length; n++) {
|
||||
const s = gradient[n];
|
||||
var gradient: IGradientstop[] = layer.renderer.colorMap.gradient;
|
||||
var histogram: IHistogram = layer.renderer.band.histogram;
|
||||
var index = (value - histogram.min) / histogram.max;
|
||||
var min = gradient[0];
|
||||
var max = gradient[gradient.length - 1];
|
||||
for (var n = 0; n < gradient.length; n++) {
|
||||
var s = gradient[n];
|
||||
if (s.relativestop <= index && min.relativestop < s.relativestop && n < gradient.length - 1) min = s;
|
||||
if (s.relativestop >= index && max.relativestop > s.relativestop && n > 0) max = s;
|
||||
}
|
||||
const i = index - min.relativestop;
|
||||
const size = max.relativestop - min.relativestop;
|
||||
const alpha = Math.round(min.color.alpha + ((max.color.alpha - min.color.alpha) * i / size));
|
||||
const red = Math.round(min.color.red + ((max.color.red - min.color.red) * i / size));
|
||||
const green = Math.round(min.color.green + ((max.color.green - min.color.green) * i / size));
|
||||
const blue = Math.round(min.color.blue + ((max.color.blue - min.color.blue) * i / size));
|
||||
var i = index - min.relativestop;
|
||||
var size = max.relativestop - min.relativestop;
|
||||
var alpha = Math.round(min.color.alpha + ((max.color.alpha - min.color.alpha) * i / size));
|
||||
var red = Math.round(min.color.red + ((max.color.red - min.color.red) * i / size));
|
||||
var green = Math.round(min.color.green + ((max.color.green - min.color.green) * i / size));
|
||||
var blue = Math.round(min.color.blue + ((max.color.blue - min.color.blue) * i / size));
|
||||
|
||||
return { alpha: alpha, red: red, green: green, blue: blue };
|
||||
}
|
||||
|
||||
getColorForValue(layer: ILayer, value: number): IColor {
|
||||
let color: IColor = { alpha:0,red:0,green:0,blue:0};
|
||||
var color: IColor = { alpha:0,red:0,green:0,blue:0};
|
||||
if(layer.renderer.colorMap.entries.length>0) {
|
||||
color=layer.renderer.colorMap.noValue;
|
||||
}
|
||||
@ -95,10 +94,10 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
}
|
||||
|
||||
getColor(item: IItem, layer: ILayer, feature): style.Style {
|
||||
const value = layer.indexKey ? feature.get(layer.indexKey) : feature.get(layer.name);
|
||||
const key = item.code + "_" + value;
|
||||
var value = layer.indexKey ? feature.get(layer.indexKey) : feature.get(layer.name);
|
||||
var key = item.code + "_" + value;
|
||||
if (!this.styleCache[key]) {
|
||||
let color: IColor;
|
||||
var color: IColor;
|
||||
if(layer.renderer.colorMap.colormapType == "manual") {
|
||||
color = this.getColorForValue(layer, value);
|
||||
} else {
|
||||
@ -126,32 +125,32 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
}
|
||||
|
||||
createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
|
||||
let layerIndex = -1;
|
||||
let layer: Layer<Source> = null;
|
||||
var layerIndex = -1;
|
||||
var layer: Layer<Source> = null;
|
||||
layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
|
||||
const source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
|
||||
let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
|
||||
layer = new Tile({ source: source });
|
||||
const data = item.data;
|
||||
const l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null;
|
||||
var data = item.data;
|
||||
var l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null;
|
||||
if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
|
||||
const rt = l.rendering as IRenderoutputTiles;
|
||||
const source = new XYZ({crossOrigin: 'use-credentials', maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
|
||||
var rt = l.rendering as IRenderoutputTiles;
|
||||
let source = new XYZ({crossOrigin: 'use-credentials', maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
|
||||
layer = new Tile({ source: source });
|
||||
}
|
||||
if (l && l.rendering && l.rendering.renderoutputType == "Image") {
|
||||
const ri = l.rendering as IRenderoutputImage;
|
||||
const source = new ImageStatic({ imageExtent:ri.extent,projection:'EPSG:3857', crossOrigin: 'use-credentials', url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${Date.parse(item.updated)}` });
|
||||
var ri = l.rendering as IRenderoutputImage;
|
||||
let source = new ImageStatic({ imageExtent:ri.extent,projection:'EPSG:3857', crossOrigin: 'use-credentials', url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${Date.parse(item.updated)}` });
|
||||
layer = new Image({ source: source });
|
||||
}
|
||||
return layer;
|
||||
}
|
||||
|
||||
createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
|
||||
let layerIndex = -1;
|
||||
let layer: Layer<Source> = null;
|
||||
var layerIndex = -1;
|
||||
var layer: Layer<Source> = null;
|
||||
layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
|
||||
const data = item.data;
|
||||
const l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
|
||||
var data = item.data;
|
||||
var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
|
||||
if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") {
|
||||
var rt = l.rendering as IRenderoutputTiles;
|
||||
layer = new VectorTileLayer({
|
||||
@ -176,15 +175,15 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
})
|
||||
});
|
||||
} else {
|
||||
const __this = this;
|
||||
const format = new GeoJSON();
|
||||
const source = new VectorSource({
|
||||
let __this = this;
|
||||
let format = new GeoJSON();
|
||||
let source = new VectorSource({
|
||||
strategy: loadingstrategy.bbox,
|
||||
loader: function (extent: Extent, resolution: number, projection: Projection) {
|
||||
const source = this as VectorSource<Feature<Geometry>>;
|
||||
var source = this as VectorSource<Geometry>;
|
||||
__this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
|
||||
const features = format.readFeatures(data).filter(feature => feature instanceof Feature) as Feature[];
|
||||
for (const f of features) {
|
||||
var features = format.readFeatures(data);
|
||||
for (let f of features) {
|
||||
if (f.get("code")) {
|
||||
f.setId(f.get("code"));
|
||||
}
|
||||
@ -197,9 +196,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
declutter: true,
|
||||
source: source,
|
||||
style: (feature) => {
|
||||
const key =feature.get("code") + "_" + feature.get("color");
|
||||
var key =feature.get("code") + "_" + feature.get("color");
|
||||
if (!this.styleCache[key]) {
|
||||
const color = feature.get("color");
|
||||
var color = feature.get("color");
|
||||
this.styleCache[key] = new style.Style(
|
||||
{
|
||||
fill: new style.Fill({
|
||||
@ -236,11 +235,11 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
}
|
||||
|
||||
createSelectionLayer(itemLayer:IItemLayer):Layer<Source> {
|
||||
let layerIndex = -1;
|
||||
const layer: Layer<Source> = null;
|
||||
var layerIndex = -1;
|
||||
var layer: Layer<Source> = null;
|
||||
layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
|
||||
const data = itemLayer.item.data;
|
||||
const l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
|
||||
var data = itemLayer.item.data;
|
||||
var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
|
||||
if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") {
|
||||
return new VectorTileLayer({
|
||||
renderMode: 'vector',
|
||||
@ -251,8 +250,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
return new style.Style(
|
||||
{
|
||||
stroke: new style.Stroke({
|
||||
color: '#0d6efd',
|
||||
width: 3
|
||||
color: 'red',
|
||||
width: 2
|
||||
})
|
||||
}
|
||||
);
|
||||
@ -266,36 +265,36 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
}
|
||||
|
||||
createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
|
||||
const data = item.data as ILayerData;
|
||||
let layer: Layer<Source> = null;
|
||||
let data = item.data as ILayerData;
|
||||
var layer: Layer<Source> = null;
|
||||
switch (data.interfaceType) {
|
||||
case 'OSM': {
|
||||
const source = new OSM();
|
||||
let source = new OSM();
|
||||
layer = new Tile({ source: source });
|
||||
break;
|
||||
}
|
||||
case 'BingMaps': {
|
||||
const source = new BingMaps(data.options);
|
||||
let source = new BingMaps(data.options);
|
||||
layer = new Tile({ source: source });
|
||||
break;
|
||||
}
|
||||
case 'TileWMS': {
|
||||
const source = new TileWMS(data.options);
|
||||
let source = new TileWMS(data.options);
|
||||
layer = new Tile({ source: source });
|
||||
break;
|
||||
}
|
||||
case 'TileJSON': {
|
||||
const source = new TileJSON(data.options);
|
||||
let source = new TileJSON(data.options);
|
||||
layer = new Tile({ source: source });
|
||||
break;
|
||||
}
|
||||
case 'TileArcGISRest': {
|
||||
const source = new TileArcGISRest(data.options);
|
||||
let source = new TileArcGISRest(data.options);
|
||||
layer = new Tile({ source: source });
|
||||
break;
|
||||
}
|
||||
case 'VectorWFSJson': {
|
||||
const source = new VectorSource({
|
||||
let source = new VectorSource({
|
||||
format: new GeoJSON(),
|
||||
url: function (extent) {
|
||||
return (
|
||||
@ -318,8 +317,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
}
|
||||
|
||||
createLayer(itemLayer: IItemLayer): Layer<Source> {
|
||||
let layer: Layer<Source> = null;
|
||||
const layerIndex = -1;
|
||||
var layer: Layer<Source> = null;
|
||||
var layerIndex = -1;
|
||||
if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
|
||||
layer = this.createGeotiffLayer(itemLayer.item,itemLayer);
|
||||
} else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
|
||||
@ -328,8 +327,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
layer = this.createExternalLayer(itemLayer.item,itemLayer);
|
||||
}
|
||||
if (layer) {
|
||||
const geometry = new GeoJSON().readGeometry(itemLayer.item.geometry);
|
||||
const extent = geometry ? proj.transformExtent(geometry.getExtent(), 'EPSG:4326', 'EPSG:3857') : null;
|
||||
let geometry = new GeoJSON().readGeometry(itemLayer.item.geometry);
|
||||
let extent = geometry ? proj.transformExtent(geometry.getExtent(), 'EPSG:4326', 'EPSG:3857') : null;
|
||||
if (extent) layer.setExtent(extent);
|
||||
}
|
||||
|
||||
@ -379,7 +378,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
if(this.topLayerPrerenderEventhandlerInstalled && this.onPrerender.observers.length > 0 )
|
||||
{
|
||||
if(this.instance.getVisible()) {
|
||||
const olLayers = this.instance.getLayers().getArray().forEach((l:any) => {
|
||||
var olLayers = this.instance.getLayers().getArray().forEach((l:any) => {
|
||||
l.un('prerender',this.topLayerPrerenderEventhandler);
|
||||
l.un('postrender',this.topLayerPostrenderEventhandler);
|
||||
});
|
||||
@ -391,9 +390,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
|
||||
addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer<Source> {
|
||||
if(!itemLayer) return null;
|
||||
const olLayers = this.instance.getLayers();
|
||||
let layer = itemLayer.layer;
|
||||
const olIndex = olLayers.getArray().indexOf(layer);
|
||||
var olLayers = this.instance.getLayers();
|
||||
var layer = itemLayer.layer;
|
||||
let olIndex = olLayers.getArray().indexOf(layer);
|
||||
if (olIndex < 0) {
|
||||
// New layer: we add it to the map
|
||||
layer = this.createLayer(itemLayer);
|
||||
@ -416,33 +415,33 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
updateLayers(itemLayers: IItemLayer[] | IItemLayer) {
|
||||
this.unInstallTopLayerPrerenderEventhandler();
|
||||
let dataLayer = false;
|
||||
let ils:IItemLayer[] = [];
|
||||
var ils:IItemLayer[] = [];
|
||||
if(Array.isArray(itemLayers)) {
|
||||
ils = itemLayers;
|
||||
} else {
|
||||
dataLayer=true;
|
||||
ils=[itemLayers];
|
||||
}
|
||||
const newLayers: Layer<Source>[] = [];
|
||||
let newLayers: Layer<Source>[] = [];
|
||||
if (ils) {
|
||||
ils.forEach((itemLayer, index) => {
|
||||
if(itemLayer.item.itemType == 'vnd.farmmaps.itemtype.temporal') {
|
||||
const il = itemLayer as ITemporalItemLayer;
|
||||
const previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length);
|
||||
let il = itemLayer as ITemporalItemLayer;
|
||||
let previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length);
|
||||
if(previousLayer) newLayers.push(previousLayer);
|
||||
const selectedLayer = this.addOrUpdateOlLayer(il.selectedItemLayer,newLayers.length);
|
||||
let selectedLayer = this.addOrUpdateOlLayer(il.selectedItemLayer,newLayers.length);
|
||||
if(selectedLayer) newLayers.push(selectedLayer);
|
||||
const nextLayer = this.addOrUpdateOlLayer(il.nextItemLayer,newLayers.length);
|
||||
let nextLayer = this.addOrUpdateOlLayer(il.nextItemLayer,newLayers.length);
|
||||
if(nextLayer) newLayers.push(nextLayer);
|
||||
this.installTopLayerPrerenderEventhandler(selectedLayer);
|
||||
} else {
|
||||
const layer = this.addOrUpdateOlLayer(itemLayer,newLayers.length);
|
||||
let layer = this.addOrUpdateOlLayer(itemLayer,newLayers.length);
|
||||
if(layer) newLayers.push(layer);
|
||||
this.installTopLayerPrerenderEventhandler(layer);
|
||||
}
|
||||
});
|
||||
// Remove the layers that have disapeared from childrenLayers
|
||||
const olLayers = this.instance.getLayers();
|
||||
var olLayers = this.instance.getLayers();
|
||||
while(olLayers.getLength() > newLayers.length) {
|
||||
olLayers.removeAt(newLayers.length);
|
||||
}
|
||||
@ -468,20 +467,20 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
// select only when having observers
|
||||
if(event.type === 'click' && !this.onFeatureSelected.observers.length) return;
|
||||
if(event.type === 'pointermove' && !this.onFeatureHover.observers.length) return;
|
||||
const itemLayer= this.getItemlayer(this.itemLayer);
|
||||
let itemLayer= this.getItemlayer(this.itemLayer);
|
||||
if(itemLayer && itemLayer.layer) {
|
||||
this.selectedFeatures = {};
|
||||
if(itemLayer.layer ) {
|
||||
const minZoom = itemLayer.layer.getMinZoom();
|
||||
const currentZoom = this.map.instance.getView().getZoom();
|
||||
let minZoom = itemLayer.layer.getMinZoom();
|
||||
let currentZoom = this.map.instance.getView().getZoom();
|
||||
if(currentZoom>minZoom) {
|
||||
itemLayer.layer.getFeatures(event.pixel).then((features) => {
|
||||
if(!features.length) {
|
||||
this.onFeatureHover.emit(null);
|
||||
return;
|
||||
}
|
||||
const fid = features[0].getId();
|
||||
const feature = features[0];
|
||||
let fid = features[0].getId();
|
||||
let feature = features[0];
|
||||
if(event.type === 'pointermove') {
|
||||
this.selectedFeatures[fid] = features[0];
|
||||
this.onFeatureHover.emit({ "feature": feature,"itemCode":itemLayer.item.code });
|
||||
@ -503,11 +502,11 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
|
||||
ngOnChanges(changes: SimpleChanges) {
|
||||
if (this.instance && this.initialized) {
|
||||
if (changes['itemLayers']) {
|
||||
const itemLayers = changes['itemLayers'].currentValue as IItemLayer[];
|
||||
var itemLayers = changes['itemLayers'].currentValue as IItemLayer[];
|
||||
this.updateLayers(itemLayers);
|
||||
}
|
||||
if (changes['itemLayer']) {
|
||||
const itemLayer = changes['itemLayer'].currentValue as IItemLayer;
|
||||
var itemLayer = changes['itemLayer'].currentValue as IItemLayer;
|
||||
this.itemLayer = itemLayer
|
||||
if(itemLayer) {
|
||||
if(this.getItemlayer(this.itemLayer).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
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 { ItemService, ItemTypeService, IItem, IItemType, FolderService } from '@farmmaps/common';
|
||||
import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken } from '@angular/core';
|
||||
import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ngx-openlayers';
|
||||
import { ItemService,ItemTypeService,IItem, IItemType } from '@farmmaps/common';
|
||||
|
||||
import { Feature } from 'ol';
|
||||
import { Point, Geometry } from 'ol/geom';
|
||||
import { Point,Geometry } from 'ol/geom';
|
||||
import { MapBrowserEvent } from 'ol';
|
||||
import { Types } from 'ol/MapBrowserEventType';
|
||||
import * as style from 'ol/style';
|
||||
@ -11,62 +11,57 @@ import * as color from 'ol/color';
|
||||
import * as loadingstrategy from 'ol/loadingstrategy';
|
||||
import * as condition from 'ol/events/condition';
|
||||
import * as extent from 'ol/extent';
|
||||
import { Vector, Cluster, Source } from 'ol/source';
|
||||
import { Layer } from 'ol/layer';
|
||||
import { GeoJSON } from 'ol/format';
|
||||
import { Select } from 'ol/interaction';
|
||||
import { IStyles } from '../../../models/style.cache';
|
||||
import { FeatureIconService } from '../../../services/feature-icon.service';
|
||||
import { Subscription } from 'rxjs';
|
||||
import { getCenter } from 'ol/extent';
|
||||
import { formatNumber } from '@angular/common';
|
||||
import {Vector,Cluster,Source} from 'ol/source';
|
||||
import {Layer} from 'ol/layer';
|
||||
import {GeoJSON} from 'ol/format';
|
||||
import {Select} from 'ol/interaction';
|
||||
import {IStyles} from '../../../models/style.cache';
|
||||
import {FeatureIconService} from '../../../services/feature-icon.service';
|
||||
|
||||
@Component({
|
||||
selector: 'fm-map-item-source-vector',
|
||||
template: `<ng-content></ng-content>`,
|
||||
providers: [
|
||||
{ provide: SourceVectorComponent, useExisting: forwardRef(() => ItemVectorSourceComponent) }
|
||||
{ provide: SourceVectorComponent , useExisting: forwardRef(() => ItemVectorSourceComponent) }
|
||||
]
|
||||
})
|
||||
export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnDestroy, OnChanges {
|
||||
instance: Vector<Feature<Geometry>>;
|
||||
export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnChanges {
|
||||
instance: Vector<Geometry>;
|
||||
private _format: GeoJSON;
|
||||
private _select: Select;
|
||||
private _hoverSelect: Select;
|
||||
private _iconScale = 0.05;
|
||||
private _iconScale: number = 0.05;
|
||||
@Input() features: Array<Feature<Geometry>>;
|
||||
@Input() selectedFeature: Feature<Geometry>;
|
||||
@Input() selectedItem: IItem;
|
||||
@Input() styles: IStyles;
|
||||
@Input() styles:IStyles;
|
||||
@Output() onFeatureSelected: EventEmitter<Feature<Geometry>> = new EventEmitter<Feature<Geometry>>();
|
||||
@Output() onFeatureHover: EventEmitter<Feature<Geometry>> = new EventEmitter<Feature<Geometry>>();
|
||||
private stylesCache: IStyles = {};
|
||||
private sub: Subscription;
|
||||
private displayMapFeatureSettings: { [code: string]: string[] } = defaultDisplayMapFeatureSettings();
|
||||
private stylesCache:IStyles = {};
|
||||
|
||||
constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, private map: MapComponent, private itemTypeService: ItemTypeService, private featureIconService$: FeatureIconService, private folderService: FolderService, @Inject(LOCALE_ID) private locale: string) {
|
||||
constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, private map: MapComponent, private itemTypeService: ItemTypeService,private featureIconService$:FeatureIconService) {
|
||||
super(layer);
|
||||
this._format = new GeoJSON();
|
||||
}
|
||||
|
||||
geometry(feature: Feature<Geometry>) {
|
||||
const view = this.map.instance.getView();
|
||||
const resolution = view.getResolution();
|
||||
let geometry = feature.getGeometry();
|
||||
const e = geometry.getExtent();
|
||||
let view = this.map.instance.getView();
|
||||
let resolution = view.getResolution();
|
||||
var geometry = feature.getGeometry();
|
||||
let e = geometry.getExtent();
|
||||
//var size = Math.max((e[2] - e[0]) / resolution, (e[3] - e[1]) / resolution);
|
||||
if (resolution > 12) {
|
||||
geometry = new Point(extent.getCenter(e));
|
||||
}
|
||||
return geometry;
|
||||
}
|
||||
}
|
||||
|
||||
getSelectedStyle(feature: Feature<Geometry>): style.Style {
|
||||
const key = feature.get('itemType') + "_selected";
|
||||
let evaluatedStyle: style.Style = undefined;
|
||||
const styleEntry = this.stylesCache[key];
|
||||
if (styleEntry) {
|
||||
if (typeof styleEntry === 'function') {
|
||||
getSelectedStyle(feature:Feature<Geometry>):style.Style {
|
||||
let key = feature.get('itemType')+"_selected";
|
||||
let evaluatedStyle: style.Style =undefined;
|
||||
var styleEntry = this.stylesCache[key];
|
||||
if(styleEntry) {
|
||||
if(typeof styleEntry === 'function') {
|
||||
evaluatedStyle = styleEntry(feature);
|
||||
} else {
|
||||
evaluatedStyle = styleEntry;
|
||||
@ -74,34 +69,22 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
|
||||
} else {
|
||||
evaluatedStyle = this.stylesCache["selected"] as style.Style;
|
||||
}
|
||||
if (evaluatedStyle) {
|
||||
evaluatedStyle.setGeometry((feature: Feature<Geometry>) => this.geometry(feature));
|
||||
if(evaluatedStyle ) {
|
||||
evaluatedStyle .setGeometry((feature:Feature<Geometry>) => this.geometry(feature));
|
||||
}
|
||||
return evaluatedStyle as style.Style
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.sub = this.folderService.getFolder('my_settings').subscribe(
|
||||
userSettingsRoot => {
|
||||
if (userSettingsRoot == undefined) return;
|
||||
this.itemService.getChildItemList(userSettingsRoot.code, 'vnd.farmmaps.itemtype.settings.general').subscribe(
|
||||
items => {
|
||||
if (items && items.length > 0 && items[0].data?.displayMapFeatureSettings) {
|
||||
this.displayMapFeatureSettings = items[0].data?.displayMapFeatureSettings;
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
);
|
||||
this.strategy = loadingstrategy.bbox;
|
||||
this.format = new GeoJSON();
|
||||
this._select = new Select({
|
||||
style: null,
|
||||
style:null,
|
||||
hitTolerance: 10,
|
||||
layers: [this.layer.instance as Layer<Source>]
|
||||
});
|
||||
this._hoverSelect = new Select({
|
||||
style: (feature: Feature<Geometry>) => {
|
||||
style: (feature:Feature<Geometry>) => {
|
||||
return this.getSelectedStyle(feature);
|
||||
},
|
||||
hitTolerance: 10,
|
||||
@ -130,51 +113,46 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
|
||||
this.host.instance.setSource(this.instance);
|
||||
|
||||
this.host.instance.setStyle((feature) => {
|
||||
const itemType = feature.get('itemType');
|
||||
let key = itemType + (this.selectedItem ? "_I" : "");
|
||||
var itemType = feature.get('itemType');
|
||||
var key = itemType + (this.selectedItem?"_I":"");
|
||||
if (!this.stylesCache[key]) {
|
||||
if (this.itemTypeService.itemTypes[itemType]) {
|
||||
const itemTypeEntry = this.itemTypeService.itemTypes[itemType];
|
||||
const fillColor = color.asArray(itemTypeEntry.iconColor);
|
||||
let itemTypeEntry = this.itemTypeService.itemTypes[itemType];
|
||||
let fillColor = color.asArray(itemTypeEntry.iconColor);
|
||||
fillColor[3] = 0;
|
||||
this.stylesCache[key] = new style.Style({
|
||||
image: itemTypeEntry.icon ? new style.Icon({
|
||||
anchor: [0.5, 1],
|
||||
scale: 0.05,
|
||||
src: this.featureIconService$.getIconImageDataUrl(itemTypeEntry.icon)
|
||||
}) : null,
|
||||
stroke: new style.Stroke({
|
||||
color: 'red',
|
||||
width: 1
|
||||
}),
|
||||
fill: new style.Fill({
|
||||
color: fillColor
|
||||
}),
|
||||
geometry: (feature: Feature<Geometry>) => this.geometry(feature),
|
||||
text: this.getDisplayTextForFeature(feature, this.map.instance.getView().getZoom())
|
||||
});
|
||||
image: itemTypeEntry.icon ? new style.Icon({
|
||||
anchor: [0.5, 1],
|
||||
scale: 0.05,
|
||||
src: this.featureIconService$.getIconImageDataUrl(itemTypeEntry.icon)
|
||||
}):null,
|
||||
stroke: new style.Stroke({
|
||||
color: 'red',
|
||||
width: 1
|
||||
}),
|
||||
fill: new style.Fill({
|
||||
color: fillColor
|
||||
}),
|
||||
geometry:(feature:Feature<Geometry>) => this.geometry(feature)
|
||||
});
|
||||
} else {
|
||||
key = 'file';
|
||||
}
|
||||
}
|
||||
let evaluatedStyle = null;
|
||||
const styleEntry = this.stylesCache[key];
|
||||
if (typeof styleEntry === 'function') {
|
||||
let evaluatedStyle =null;
|
||||
var styleEntry = this.stylesCache[key];
|
||||
if(typeof styleEntry === 'function') {
|
||||
evaluatedStyle = styleEntry(feature);
|
||||
} else {
|
||||
evaluatedStyle = styleEntry;
|
||||
}
|
||||
if (evaluatedStyle && evaluatedStyle.geometry_ == null && !Array.isArray(evaluatedStyle)) {
|
||||
if(evaluatedStyle && evaluatedStyle.geometry_ == null) {
|
||||
evaluatedStyle.setGeometry((feature) => this.geometry(feature));
|
||||
}
|
||||
return evaluatedStyle;
|
||||
});
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
if (this.sub) this.sub.unsubscribe();
|
||||
}
|
||||
|
||||
ngOnChanges(changes: SimpleChanges) {
|
||||
if (changes["features"] && this.instance) {
|
||||
this.instance.clear(true);
|
||||
@ -183,8 +161,8 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
|
||||
}
|
||||
|
||||
if (changes["selectedFeature"] && this.instance) {
|
||||
const features = this._hoverSelect.getFeatures();
|
||||
const feature = changes["selectedFeature"].currentValue
|
||||
var features = this._hoverSelect.getFeatures();
|
||||
var feature = changes["selectedFeature"].currentValue
|
||||
//this.instance.clear(false);
|
||||
//this.instance.addFeatures(features.getArray());
|
||||
features.clear();
|
||||
@ -194,67 +172,20 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
|
||||
}
|
||||
}
|
||||
if (changes["selectedItem"] && this.instance) {
|
||||
const item = changes["selectedItem"].currentValue
|
||||
var item = changes["selectedItem"].currentValue
|
||||
if (item) {
|
||||
this.map.instance.removeInteraction(this._hoverSelect);
|
||||
} else {
|
||||
this.map.instance.addInteraction(this._hoverSelect);
|
||||
}
|
||||
}
|
||||
if (changes["styles"]) {
|
||||
const styles = changes["styles"].currentValue;
|
||||
if (changes["styles"] && this.instance) {
|
||||
let styles = changes["styles"].currentValue;
|
||||
for (const key in styles) {
|
||||
if (styles.hasOwnProperty(key)) {
|
||||
this.stylesCache[key] = styles[key];
|
||||
this.stylesCache[key]=styles[key];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
getDisplayTextForFeature(feature: Feature<Geometry>, zoom: number, overrule?: style.Text) {
|
||||
if (!feature) return null;
|
||||
|
||||
const propertiesToShow: string[] = this.displayMapFeatureSettings[feature.get('itemType')];
|
||||
if (!propertiesToShow) return null;
|
||||
if (propertiesToShow.length <= 0) return null;
|
||||
if (zoom < 14) return null;
|
||||
|
||||
let displayText = '';
|
||||
for (let i = 0; i < propertiesToShow.length; i++) {
|
||||
let value = feature.get(propertiesToShow[i]);
|
||||
switch (propertiesToShow[i]) {
|
||||
case "area": value = formatNumber(value, this.locale, '0.1-2') + ' ha'; break;
|
||||
case "centroid": {
|
||||
if (feature.getGeometry()) {
|
||||
const centroid = getCenter(feature.getGeometry().getExtent());
|
||||
value = Math.round(centroid[0]) + ',' + Math.round(centroid[1]);
|
||||
}
|
||||
}
|
||||
if (value) {
|
||||
displayText += value + (i < propertiesToShow.length ? '\n' : '');
|
||||
}
|
||||
}
|
||||
|
||||
const styleText = new style.Text({
|
||||
font: '13px Calibri,sans-serif',
|
||||
fill: new style.Fill({ color: '#ffffff' }),
|
||||
stroke: new style.Stroke({ color: '#000000', width: 2 }),
|
||||
text: displayText
|
||||
});
|
||||
|
||||
if (overrule) {
|
||||
if (overrule.getFont()) styleText.setFont(overrule.getFont());
|
||||
if (overrule.getFill()) styleText.setFill(overrule.getFill());
|
||||
if (overrule.getStroke()) styleText.setStroke(overrule.getStroke());
|
||||
}
|
||||
|
||||
return styleText;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function defaultDisplayMapFeatureSettings() {
|
||||
return {
|
||||
'vnd.farmmaps.itemtype.cropfield': ['name', 'cropTypeName', 'area']
|
||||
};
|
||||
}
|
||||
@ -9,8 +9,8 @@ import { IItemLayer } from '../../../models/item.layer';
|
||||
|
||||
export class LayerListComponent {
|
||||
@Input() itemLayers: IItemLayer[] = [];
|
||||
@Input() baseLayers = false;
|
||||
@Input() dataLayers = false;
|
||||
@Input() baseLayers: boolean = false;
|
||||
@Input() dataLayers: boolean = false;
|
||||
@Output() onToggleVisibility = new EventEmitter<IItemLayer>();
|
||||
@Output() onSetOpacity = new EventEmitter<{layer: IItemLayer,opacity:number }>();
|
||||
@Output() onDelete = new EventEmitter<IItemLayer>();
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<li class="border-top pt-1 pb-1 value" *ngFor="let layerValue of layers">
|
||||
<div>{{layerValue.layerName}}</div>
|
||||
<div>{{layerValue.date|date}}</div>
|
||||
<div><span *ngIf="layerValue.quantity"><span class="me-1">{{layerValue.quantity}}</span> </span><span class="me-1 font-weight-bold">{{getScaledValue(layerValue)}}</span><span>{{layerValue.unit}}</span></div>
|
||||
<div><span *ngIf="layerValue.quantity"><span class="me-1">{{layerValue.quantity}}</span> </span><span class="me-1 font-weight-bold">{{layerValue.value}}</span><span>{{layerValue.unit}}</span></div>
|
||||
</li>
|
||||
</ul>
|
||||
<ng-template #no_data>
|
||||
@ -15,4 +15,4 @@
|
||||
</ng-template>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>>
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
import { Component, OnInit, Input, ViewChild, ElementRef, AfterViewInit } from '@angular/core';
|
||||
import { IItemLayer } from '../../../models/item.layer';
|
||||
import { Component, OnInit,Input,ViewChild,ElementRef,AfterViewInit } from '@angular/core';
|
||||
import {IItemLayer} from '../../../models/item.layer';
|
||||
import { Store } from '@ngrx/store';
|
||||
import * as mapReducers from '../../../reducers/map.reducer';
|
||||
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 { Observable, interval, Subject } from 'rxjs';
|
||||
import { Observable,interval,Subject } from 'rxjs';
|
||||
import { debounce, throttle } from 'rxjs/operators';
|
||||
import { toLonLat } from 'ol/proj';
|
||||
import { toStringHDMS } from 'ol/coordinate';
|
||||
import { ClipboardService } from 'ngx-clipboard'
|
||||
import { GeoJSON, WKT } from 'ol/format';
|
||||
import {GeoJSON,WKT} from 'ol/format';
|
||||
import { Point } from 'ol/geom';
|
||||
|
||||
@Component({
|
||||
@ -18,19 +18,19 @@ import { Point } from 'ol/geom';
|
||||
templateUrl: './layer-values.component.html',
|
||||
styleUrls: ['./layer-values.component.scss']
|
||||
})
|
||||
export class LayerValuesComponent implements OnInit, AfterViewInit {
|
||||
export class LayerValuesComponent implements OnInit,AfterViewInit {
|
||||
|
||||
@ViewChild('layerValues') containerRef: ElementRef;
|
||||
offsetX$ = 0;
|
||||
offsetY$ = 0;
|
||||
lonlat$ = "";
|
||||
wkt$ = "";
|
||||
layerValues$: Observable<Array<ILayervalue>> = this.store.select(mapReducers.selectGetLayerValues);
|
||||
enabled$: Observable<boolean> = this.store.select(mapReducers.selectGetLayerValuesEnabled);
|
||||
wktFormat$: WKT;
|
||||
@ViewChild('layerValues') containerRef:ElementRef;
|
||||
offsetX$:number =0;
|
||||
offsetY$:number =0;
|
||||
lonlat$: string="";
|
||||
wkt$= "";
|
||||
layerValues$:Observable<Array<ILayervalue>> = this.store.select(mapReducers.selectGetLayerValues);
|
||||
enabled$:Observable<boolean> = this.store.select(mapReducers.selectGetLayerValuesEnabled);
|
||||
wktFormat$:WKT;
|
||||
|
||||
constructor(private store: Store<mapReducers.State>, private map: MapComponent, private clipboardService$: ClipboardService) {
|
||||
this.wktFormat$ = new WKT();
|
||||
constructor( private store: Store<mapReducers.State>,private map: MapComponent,private clipboardService$:ClipboardService) {
|
||||
this.wktFormat$=new WKT();
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
@ -39,32 +39,24 @@ export class LayerValuesComponent implements OnInit, AfterViewInit {
|
||||
|
||||
moveEndSubject = new Subject<any>();
|
||||
|
||||
ngAfterViewInit(): void {
|
||||
ngAfterViewInit():void {
|
||||
this.offsetY$ = this.containerRef.nativeElement.offsetTop;
|
||||
this.offsetX$ = this.containerRef.nativeElement.offsetLeft;
|
||||
this.map.instance.on('moveend', () => {
|
||||
this.moveEndSubject.next({});
|
||||
});
|
||||
this.moveEndSubject.pipe(throttle(ev => interval(100))).subscribe(() => this.updateValuesLocation());
|
||||
this.moveEndSubject.pipe(throttle(ev => interval(100))).subscribe(() => this.updateValuesLocation());
|
||||
}
|
||||
|
||||
updateValuesLocation() {
|
||||
const xy = this.map.instance.getCoordinateFromPixel([this.offsetX$, this.offsetY$])
|
||||
const lonlat = toLonLat(xy);
|
||||
var xy = this.map.instance.getCoordinateFromPixel([this.offsetX$,this.offsetY$])
|
||||
var lonlat = toLonLat(xy);
|
||||
this.wkt$ = this.wktFormat$.writeGeometry(new Point(lonlat))
|
||||
this.lonlat$ = toStringHDMS(lonlat);
|
||||
this.store.dispatch(new mapActions.SetLayerValuesLocation(xy[0], xy[1]));
|
||||
this.store.dispatch(new mapActions.SetLayerValuesLocation(xy[0],xy[1]));
|
||||
}
|
||||
|
||||
copyToClipboard() {
|
||||
this.clipboardService$.copy(this.wkt$);
|
||||
}
|
||||
|
||||
public getScaledValue(layerValue: ILayervalue): number {
|
||||
let v = layerValue.value;
|
||||
if (layerValue.scale && layerValue.scale != 0) {
|
||||
v = layerValue.scale * layerValue.value;
|
||||
}
|
||||
return v;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
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 { Vector as VectorSource } from 'ol/source';
|
||||
import { Geometry } from 'ol/geom';
|
||||
import Feature from 'ol/Feature';
|
||||
|
||||
@Component({
|
||||
selector: 'fm-map-aol-layer-vector-image',
|
||||
@ -15,7 +14,7 @@ export class LayerVectorImageComponent extends LayerVectorComponent implements O
|
||||
//public source: Vector;
|
||||
|
||||
@Input()
|
||||
renderMode: RenderType<VectorSource<Feature<Geometry>>> | string = "image";
|
||||
renderMode: RenderType<VectorSource<Geometry>> | string = "image";
|
||||
|
||||
constructor(map: MapComponent) {
|
||||
super(map);
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
|
||||
.gps-location {
|
||||
display:block;
|
||||
width:2.5em;
|
||||
height:2.5em;
|
||||
background-color: var(--bs-body-bg);
|
||||
background-color: $body-bg;
|
||||
background-size: contain;
|
||||
margin-top:0.5em;
|
||||
border-radius: 1.75em;
|
||||
@ -14,15 +17,15 @@
|
||||
}
|
||||
|
||||
.pan-to {
|
||||
fill: var(--bs-secondary);
|
||||
fill: $secondary;
|
||||
}
|
||||
|
||||
div.gps-location:hover .pan-to {
|
||||
fill: var(--bs-white);
|
||||
fill: $white;
|
||||
}
|
||||
|
||||
.pan-to-centered {
|
||||
fill: var(--bs-primary);
|
||||
fill: $primary;
|
||||
}
|
||||
|
||||
div.gps-location:hover .pan-to-centered {
|
||||
@ -30,5 +33,5 @@ div.gps-location:hover .pan-to-centered {
|
||||
}
|
||||
|
||||
.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 { MapComponent } from '@farmmaps/ng-openlayers';
|
||||
import { MapComponent } from 'ngx-openlayers';
|
||||
import {IMapState} from '../../../models/map.state'
|
||||
import {View} from 'ol';
|
||||
import { fromLonLat } from 'ol/proj';
|
||||
@ -43,12 +43,12 @@ export class PanToLocation implements OnInit,OnChanges{
|
||||
|
||||
public centered():boolean {
|
||||
if(this.position && this.mapState) {
|
||||
const center = this.view.getCenter();
|
||||
const newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]);
|
||||
const x1 = newCenter[0].toFixed(0);
|
||||
const x2 = center[0].toFixed(0);
|
||||
const y1 = newCenter[1].toFixed(0);
|
||||
const y2 = center[1].toFixed(0);
|
||||
let center = this.view.getCenter();
|
||||
let newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]);
|
||||
let x1 = newCenter[0].toFixed(0);
|
||||
let x2 = center[0].toFixed(0);
|
||||
let y1 = newCenter[1].toFixed(0);
|
||||
let y2 = center[1].toFixed(0);
|
||||
return x1==x2 && y1==y2;
|
||||
}
|
||||
return false;
|
||||
@ -60,17 +60,17 @@ export class PanToLocation implements OnInit,OnChanges{
|
||||
|
||||
handleClick(event:Event) {
|
||||
if(this.position) {
|
||||
const view = this.map.instance.getView();
|
||||
const newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]);
|
||||
const extent = [newCenter[0]-500,newCenter[1]-500,newCenter[0]+500,newCenter[1]+500];
|
||||
const options = { padding: [0, 0, 0, 0],minResolution:1 };
|
||||
const size = this.map.instance.getSize();
|
||||
const rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
|
||||
const threshold = 44 * rem;
|
||||
let left = 1 * rem;
|
||||
const right = 1 * rem;
|
||||
let bottom = Math.round(size[1] / 2);
|
||||
const top = 1 * rem;
|
||||
let view = this.map.instance.getView();
|
||||
let newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]);
|
||||
let extent = [newCenter[0]-500,newCenter[1]-500,newCenter[0]+500,newCenter[1]+500];
|
||||
var options = { padding: [0, 0, 0, 0],minResolution:1 };
|
||||
let size = this.map.instance.getSize();
|
||||
let rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
|
||||
let threshold = 44 * rem;
|
||||
var left = 1 * rem;
|
||||
var right = 1 * rem;
|
||||
var bottom = Math.round(size[1] / 2);
|
||||
var top = 1 * rem;
|
||||
if (size[0] > threshold) {
|
||||
bottom = 1 * rem;
|
||||
left = 23 * rem;
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
.compass {
|
||||
width:2.5em;
|
||||
height:2.5em;
|
||||
@ -11,7 +13,7 @@
|
||||
|
||||
#north {
|
||||
display: none;
|
||||
fill:var(--bs-black);
|
||||
fill:$black;
|
||||
}
|
||||
|
||||
#top-l {
|
||||
@ -31,23 +33,23 @@
|
||||
}
|
||||
|
||||
div.compass:hover #top-l {
|
||||
fill:var(--bs-white);
|
||||
fill:$white;
|
||||
}
|
||||
|
||||
div.compass:hover #top-r {
|
||||
fill:var(--bs-gray-300);
|
||||
fill:$gray-300;
|
||||
}
|
||||
|
||||
div.compass:hover #bottom-l {
|
||||
fill:var(--bs-gray-300);
|
||||
fill:$gray-300;
|
||||
}
|
||||
|
||||
div.compass:hover #bottom-r {
|
||||
fill:var(--bs-white);
|
||||
fill:$white;
|
||||
}
|
||||
|
||||
div.compass:hover #north {
|
||||
fill:var(--bs-white);
|
||||
fill:$white;
|
||||
}
|
||||
|
||||
.compass-n {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
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';
|
||||
|
||||
@ -14,7 +14,7 @@ export class RotationResetComponent implements OnInit {
|
||||
view: View;
|
||||
|
||||
public Rotation() {
|
||||
const rotation = this.view ? this.view.getRotation() : 0;
|
||||
let rotation = this.view ? this.view.getRotation() : 0;
|
||||
return `rotate(${rotation}rad)`;
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { Component, Host, Input, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
import { ViewComponent, MapComponent } from '@farmmaps/ng-openlayers';
|
||||
import { ViewComponent, MapComponent } from 'ngx-openlayers';
|
||||
|
||||
|
||||
@Component({
|
||||
@ -10,19 +10,19 @@ import { ViewComponent, MapComponent } from '@farmmaps/ng-openlayers';
|
||||
export class ZoomToExtentComponent implements OnChanges {
|
||||
view: ViewComponent;
|
||||
map: MapComponent;
|
||||
paddingTop = 0;
|
||||
paddingLeft = 0;
|
||||
paddingBottom = 0;
|
||||
paddingRight = 0;
|
||||
paddingTop: number = 0;
|
||||
paddingLeft: number = 0;
|
||||
paddingBottom: number = 0;
|
||||
paddingRight: number = 0;
|
||||
|
||||
@Input() extent: number[];
|
||||
@Input() animate = false;
|
||||
@Input() animate: boolean = false;
|
||||
|
||||
constructor(@Host() view: ViewComponent, @Host() map: MapComponent,route: ActivatedRoute ) {
|
||||
this.view = view;
|
||||
this.map = map;
|
||||
if(route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-zoom-to-extent"]) {
|
||||
const params = route.snapshot.data["fm-map-zoom-to-extent"];
|
||||
let params = route.snapshot.data["fm-map-zoom-to-extent"];
|
||||
this.paddingTop = params["padding-top"] ? params["padding-top"] : 0;
|
||||
this.paddingBottom = params["padding-bottom"] ? params["padding-bottom"] : 0;
|
||||
this.paddingLeft = params["padding-left"] ? params["padding-left"] : 0;
|
||||
@ -32,14 +32,14 @@ export class ZoomToExtentComponent implements OnChanges {
|
||||
|
||||
ngOnChanges(changes: SimpleChanges) {
|
||||
if (this.extent) {
|
||||
const options = { padding: [0, 0, 0, 0],minResolution:1 };
|
||||
const size = this.map.instance.getSize();
|
||||
const rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
|
||||
const threshold = 40 * rem;
|
||||
let left = 1 * rem;
|
||||
const right = 1 * rem;
|
||||
let bottom = Math.round((size[1] / 2) + (4*rem));
|
||||
const top = 1 * rem;
|
||||
var options = { padding: [0, 0, 0, 0],minResolution:1 };
|
||||
let size = this.map.instance.getSize();
|
||||
let rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
|
||||
let threshold = 40 * rem;
|
||||
var left = 1 * rem;
|
||||
var right = 1 * rem;
|
||||
var bottom = Math.round((size[1] / 2) + (4*rem));
|
||||
var top = 1 * rem;
|
||||
if (size[0] > threshold) {
|
||||
bottom = 5 * rem;
|
||||
left = 23 * rem;
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
|
||||
|
||||
.row {
|
||||
border-bottom: 1px solid var(--bs-gray-500);
|
||||
border-bottom: 1px solid $gray-500;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.row.selected {
|
||||
background-color: var(--bs-gray-100);
|
||||
background-color: $gray-100;
|
||||
}
|
||||
|
||||
@media screen and (min-width: 44rem) {
|
||||
|
||||
@ -33,7 +33,7 @@ export class FeatureListContainerComponent {
|
||||
let componentFactory: ComponentFactory<AbstractFeatureListComponent> = this.componentFactoryResolver.resolveComponentFactory(FeatureListComponent); // default
|
||||
let selected = -1;
|
||||
let maxMatches =0;
|
||||
const showItem = true;
|
||||
let showItem = true;
|
||||
for (let i = 0; i < this.featureLists.length; i++) {
|
||||
let matches=0;
|
||||
let criteria=0;
|
||||
@ -64,9 +64,9 @@ export class FeatureListContainerComponent {
|
||||
viewContainerRef.clear();
|
||||
if(showItem) {
|
||||
this.componentRef = viewContainerRef.createComponent(componentFactory);
|
||||
(<AbstractFeatureListComponent>this.componentRef.instance).features = this.features;
|
||||
(<AbstractFeatureListComponent>this.componentRef.instance).queryState = this.queryState;
|
||||
(<AbstractFeatureListComponent>this.componentRef.instance).selectedFeature = this.selectedFeature;
|
||||
(<AbstractFeatureListComponent>this.componentRef.instance).features = null;
|
||||
(<AbstractFeatureListComponent>this.componentRef.instance).queryState = queryState;
|
||||
(<AbstractFeatureListComponent>this.componentRef.instance).selectedFeature = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,20 +1,22 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
fm-map-feature-list-feature-container {
|
||||
width:100%;
|
||||
pointer-events:none;
|
||||
}
|
||||
|
||||
.row {
|
||||
border-bottom: 1px solid var(--bs-gray-500);
|
||||
border-bottom: 1px solid $gray-500;
|
||||
user-select: none;
|
||||
padding-left:1.5rem;
|
||||
}
|
||||
|
||||
.row.selected {
|
||||
background-color: var(--bs-gray-100);
|
||||
background-color: $gray-100;
|
||||
}
|
||||
|
||||
.cropfields {
|
||||
border-top: 1px solid var(--bs-gray-500);
|
||||
border-top: 1px solid $gray-500;
|
||||
margin-left: -1.25rem;
|
||||
margin-right: -1.25rem;
|
||||
}
|
||||
|
||||
@ -1,20 +1,22 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
fm-map-feature-list-feature-container {
|
||||
width:100%;
|
||||
pointer-events:none;
|
||||
}
|
||||
|
||||
.row {
|
||||
border-bottom: 1px solid var(--bs-gray-500);
|
||||
border-bottom: 1px solid $gray-500;
|
||||
user-select: none;
|
||||
padding-left:1.5rem;
|
||||
}
|
||||
|
||||
.row.selected {
|
||||
background-color: var(--bs-gray-100);
|
||||
background-color: $gray-100;
|
||||
}
|
||||
|
||||
.farms {
|
||||
border-top: 1px solid var(--bs-gray-500);
|
||||
border-top: 1px solid $gray-500;
|
||||
margin-left: -1.25rem;
|
||||
margin-right: -1.25rem;
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ export class FeatureListCroppingschemeComponent extends AbstractFeatureListCompo
|
||||
}
|
||||
|
||||
getAction(feature:Feature<Geometry>):Action {
|
||||
const queryState = tassign(mapReducers.initialState.queryState, { parentCode: feature.get('code'), itemType: "vnd.farmmaps.itemtype.cropfield" });
|
||||
var queryState = tassign(mapReducers.initialState.queryState, { parentCode: feature.get('code'), itemType: "vnd.farmmaps.itemtype.cropfield" });
|
||||
return new mapActions.DoQuery(queryState);
|
||||
}
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ export class FeatureListFeatureContainerComponent {
|
||||
@ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective;
|
||||
|
||||
loadComponent() {
|
||||
let componentFactory: ComponentFactory<AbstractFeatureListFeatureComponent> = this.componentFactoryResolver.resolveComponentFactory(FeatureListFeatureComponent); // default
|
||||
var componentFactory: ComponentFactory<AbstractFeatureListFeatureComponent> = this.componentFactoryResolver.resolveComponentFactory(FeatureListFeatureComponent); // default
|
||||
|
||||
let selected = -1;
|
||||
let maxMatches =0;
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
|
||||
|
||||
.card-title {
|
||||
font-size: 1rem;
|
||||
white-space: nowrap;
|
||||
|
||||
@ -27,7 +27,7 @@ export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFea
|
||||
areaInHa(feature:Feature<Geometry>):number {
|
||||
if(!feature) return 0;
|
||||
// get area from faeture if 0 calculate from polygon
|
||||
const a = feature.get('area');
|
||||
let a = feature.get('area');
|
||||
if(a) return a;
|
||||
return getArea(feature.getGeometry(),{projection:"EPSG:3857"}) / 10000;
|
||||
}
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
|
||||
|
||||
.card-title {
|
||||
font-size: 1rem;
|
||||
white-space: nowrap;
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
|
||||
|
||||
.card-title {
|
||||
font-size: 1rem;
|
||||
white-space: nowrap;
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
fm-map-feature-list-feature-container {
|
||||
width: 100%;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.row {
|
||||
border-bottom: 1px solid var(--bs-gray-500);
|
||||
border-bottom: 1px solid $gray-500;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.row.selected {
|
||||
background-color: var(--bs-gray-100);
|
||||
background-color: $gray-100;
|
||||
}
|
||||
|
||||
@ -23,14 +23,13 @@ export abstract class AbstractFeatureListComponent {
|
||||
|
||||
handleFeatureClick(feature:Feature<Geometry>) {
|
||||
if(feature) {
|
||||
this.store.dispatch(new mapActions.ClickFeature(feature));
|
||||
const action = this.getAction(feature);
|
||||
let action = this.getAction(feature);
|
||||
this.store.dispatch(action);
|
||||
}
|
||||
}
|
||||
|
||||
getAction(feature:Feature<Geometry>):Action {
|
||||
const newQuery: any = tassign(mapReducers.initialState.queryState);
|
||||
var newQuery: any = tassign(mapReducers.initialState.queryState);
|
||||
newQuery.parentCode = feature.get('parentCode');
|
||||
newQuery.itemCode = feature.get('code');
|
||||
newQuery.itemType = feature.get('itemType');
|
||||
|
||||
@ -30,7 +30,7 @@ export class GeometryThumbnailComponent implements AfterViewInit {
|
||||
this.geometry,
|
||||
this.width,
|
||||
this.height);
|
||||
}
|
||||
};
|
||||
|
||||
private defaultStyle:style.Style = new style.Style({
|
||||
stroke: new style.Stroke({ color: 'black',width:1.5 })
|
||||
@ -52,24 +52,24 @@ export class GeometryThumbnailComponent implements AfterViewInit {
|
||||
this.height);
|
||||
}
|
||||
|
||||
private width = 0;
|
||||
private height = 0;
|
||||
private width:number = 0;
|
||||
private height:number = 0;
|
||||
|
||||
render(canvas,style:style.Style,geometry:Geometry,width:number,height:number) {
|
||||
if(canvas && canvas.nativeElement && geometry && style) {
|
||||
const renderContext = render.toContext(canvas.nativeElement.getContext( '2d'),{ size: [width, height] });
|
||||
let renderContext = render.toContext(canvas.nativeElement.getContext( '2d'),{ size: [width, height] });
|
||||
|
||||
const geom = geometry.clone() as Polygon,
|
||||
let geom = geometry.clone() as Polygon,
|
||||
line = geom.getCoordinates()[0],
|
||||
e = extent.boundingExtent( line );
|
||||
|
||||
const dxy = extent.getCenter(e),
|
||||
let dxy = extent.getCenter(e),
|
||||
sxy = [
|
||||
(width - 2 ) / extent.getWidth(e),
|
||||
(height - 2 ) / extent.getHeight(e)
|
||||
];
|
||||
|
||||
const dx = dxy[0],
|
||||
let dx = dxy[0],
|
||||
dy = dxy[1],
|
||||
sx = sxy[0],
|
||||
sy = sxy[1];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import { Directive, ViewContainerRef,TemplateRef,OnInit,Input, OnChanges } from '@angular/core';
|
||||
import { Layer } from 'ol/layer';
|
||||
import { Source } from 'ol/source';
|
||||
import { MapComponent } from '@farmmaps/ng-openlayers';
|
||||
import { MapComponent } from 'ngx-openlayers';
|
||||
|
||||
@Directive({
|
||||
selector: '[fmMapIfZoomToShow]',
|
||||
@ -43,9 +43,9 @@ export class ifZoomToShowDirective implements OnInit {
|
||||
|
||||
checkZoom() {
|
||||
if(this.layer$ && this.map$.instance) {
|
||||
const minZoom = this.layer$.getMinZoom();
|
||||
const currentZoom = this.map$.instance.getView().getZoom();
|
||||
const view = currentZoom < minZoom;
|
||||
let minZoom = this.layer$.getMinZoom();
|
||||
let currentZoom = this.map$.instance.getView().getZoom();
|
||||
let view = currentZoom < minZoom;
|
||||
if(view!= this.showView) {
|
||||
this.viewContainerRef$.clear();
|
||||
this.showView=view;
|
||||
|
||||
@ -23,11 +23,11 @@ export class ItemListItemContainerComponent {
|
||||
@ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective;
|
||||
|
||||
loadComponent() {
|
||||
let componentFactory: ComponentFactory<AbstractItemListItemComponent> = this.componentFactoryResolver.resolveComponentFactory(ItemListItemComponent); // default
|
||||
var componentFactory: ComponentFactory<AbstractItemListItemComponent> = this.componentFactoryResolver.resolveComponentFactory(ItemListItemComponent); // default
|
||||
|
||||
let selected = -1;
|
||||
let maxMatches =0;
|
||||
const showItem = true;
|
||||
let showItem = true;
|
||||
for (let i = 0; i < this.itemComponentList.length; i++) {
|
||||
let matches=0;
|
||||
let criteria=0;
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
.widget {
|
||||
padding:0.8rem;
|
||||
height:100%;
|
||||
|
||||
@ -13,7 +13,7 @@ export abstract class AbstractItemListItemComponent {
|
||||
constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService) {
|
||||
}
|
||||
|
||||
getScaledValue(value:number,scale = 0):number {
|
||||
getScaledValue(value:number,scale:number = 0):number {
|
||||
let v = value;
|
||||
if(scale && scale != 0) {
|
||||
v=scale*value;
|
||||
@ -30,7 +30,7 @@ export abstract class AbstractItemWidgetComponent {
|
||||
constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService) {
|
||||
}
|
||||
|
||||
getScaledValue(value:number,scale = 0):number {
|
||||
getScaledValue(value:number,scale:number = 0):number {
|
||||
let v = value;
|
||||
if(scale && scale != 0) {
|
||||
v=scale*value;
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
.widget-container {
|
||||
overflow:auto;
|
||||
margin-bottom:1rem;
|
||||
@ -5,7 +7,7 @@
|
||||
|
||||
.widget {
|
||||
position:relative;
|
||||
border: 1px solid var(--bs-gray-500);
|
||||
border: 1px solid $gray-500;
|
||||
user-select: none;
|
||||
display:inline-block;
|
||||
width:50%;
|
||||
@ -26,7 +28,7 @@
|
||||
}
|
||||
|
||||
.widget:hover {
|
||||
background-color: var(--bs-gray-100);
|
||||
background-color: $gray-100;
|
||||
}
|
||||
|
||||
.widget-container {
|
||||
|
||||
@ -15,7 +15,7 @@ export abstract class AbstractItemListComponent {
|
||||
}
|
||||
|
||||
handleItemClick(item:IListItem) {
|
||||
const newQuery: any = tassign(mapReducers.initialState.query);
|
||||
var newQuery: any = tassign(mapReducers.initialState.query);
|
||||
newQuery.itemCode = item.code;
|
||||
this.store.dispatch(new mapActions.DoQuery(newQuery));
|
||||
}
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
.widget-container {
|
||||
overflow:auto;
|
||||
margin-bottom:1rem;
|
||||
@ -5,7 +7,7 @@
|
||||
|
||||
.widget {
|
||||
position:relative;
|
||||
border: 1px solid var(--bs-gray-500);
|
||||
border: 1px solid $gray-500;
|
||||
user-select: none;
|
||||
display:inline-block;
|
||||
width:50%;
|
||||
@ -26,7 +28,7 @@
|
||||
}
|
||||
|
||||
.widget:hover {
|
||||
background-color: var(--bs-gray-100);
|
||||
background-color: $gray-100;
|
||||
}
|
||||
|
||||
.widget-container {
|
||||
|
||||
@ -23,10 +23,10 @@ export class ItemWidgetListComponent implements AfterViewInit {
|
||||
}
|
||||
|
||||
ngAfterViewInit() {
|
||||
const targets = this.widgetTargets.toArray();
|
||||
let targets = this.widgetTargets.toArray();
|
||||
if(this.widgets) {
|
||||
for (let i = 0; i < this.widgets.length; i++) {
|
||||
const componentFactory: ComponentFactory<AbstractItemWidgetComponent> = this.componentFactoryResolver.resolveComponentFactory(this.widgets[i]['constructor'] as any);
|
||||
for (var i = 0; i < this.widgets.length; i++) {
|
||||
var componentFactory: ComponentFactory<AbstractItemWidgetComponent> = this.componentFactoryResolver.resolveComponentFactory(this.widgets[i]['constructor'] as any);
|
||||
const viewContainerRef = targets[i];
|
||||
viewContainerRef.clear();
|
||||
|
||||
|
||||
@ -1,15 +1,18 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
|
||||
.layer-switcher {
|
||||
display:block;
|
||||
width:2.5em;
|
||||
height:2.5em;
|
||||
background-color: var(--bs-body-bg);
|
||||
background-color: $body-bg;
|
||||
background-size: contain;
|
||||
margin-top:0.5em;
|
||||
text-align: center;
|
||||
line-height: 2.5em;
|
||||
border-radius: 1.75em;
|
||||
padding: 0;
|
||||
color: var(--bs-secondary);
|
||||
color: $secondary;
|
||||
}
|
||||
|
||||
.layer-switcher i {
|
||||
@ -21,7 +24,7 @@
|
||||
}
|
||||
|
||||
.layers {
|
||||
color:var(--bs-secondary);
|
||||
color:$secondary;
|
||||
position: absolute;
|
||||
overflow: hidden;
|
||||
bottom: -1em;
|
||||
|
||||
@ -62,7 +62,7 @@ export class LayerSwitcher implements OnInit,OnChanges{
|
||||
}
|
||||
|
||||
handleZoomToExtent(itemLayer: IItemLayer) {
|
||||
const extent = createEmpty();
|
||||
var extent = createEmpty();
|
||||
extend(extent, itemLayer.layer.getExtent());
|
||||
if (extent) {
|
||||
this.store.dispatch(new mapActions.SetExtent(extent));
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
<div class="row ps-3">
|
||||
<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-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-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-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()">
|
||||
<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>
|
||||
</div>
|
||||
|
||||
@ -14,17 +14,6 @@ export class HistogramDetailsComponent {
|
||||
@Input()
|
||||
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 {
|
||||
return this.histogram.confidence != null && this.histogram.confidence !== 1;
|
||||
}
|
||||
|
||||
@ -31,11 +31,11 @@
|
||||
<td colspan="4" class="pb-1 pt-1">
|
||||
<div class="info" [ngbCollapse]="hideHistogramDetails">
|
||||
<ng-container *ngIf="bandContainsStatistics(); else histogram">
|
||||
<fm-map-statistics-details [statistics]="layer.renderer.band.statistics" [scale]="layer.scale"></fm-map-statistics-details>
|
||||
<fm-map-statistics-details [statistics]="layer.renderer.band.statistics"></fm-map-statistics-details>
|
||||
</ng-container>
|
||||
|
||||
<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>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
@ -29,7 +29,7 @@ export class LegendComponent implements OnInit,AfterViewInit {
|
||||
histogram: string;
|
||||
|
||||
@Input()
|
||||
showTitle = true;
|
||||
showTitle: boolean = true;
|
||||
|
||||
@Input()
|
||||
histogramenabled: boolean;
|
||||
@ -40,7 +40,7 @@ export class LegendComponent implements OnInit,AfterViewInit {
|
||||
@Input()
|
||||
histogramunit: string;
|
||||
|
||||
public hideHistogramDetails = true;
|
||||
public hideHistogramDetails:boolean = true;
|
||||
|
||||
onClickHistoGram(): void {
|
||||
this.histogramenabled = !this.histogramenabled;
|
||||
@ -63,9 +63,9 @@ export class LegendComponent implements OnInit,AfterViewInit {
|
||||
}
|
||||
|
||||
public getPart(renderer: IRenderer, index: number): string {
|
||||
const max = renderer.band.histogram.entries.reduce((max, entry) => entry.freqency > max ? entry.freqency : max, 0);
|
||||
const scale = 65 / max;
|
||||
const part = (renderer.band.histogram.entries[index].freqency * scale) + "%";
|
||||
let max = renderer.band.histogram.entries.reduce((max, entry) => entry.freqency > max ? entry.freqency : max, 0);
|
||||
let scale = 65 / max;
|
||||
let part = (renderer.band.histogram.entries[index].freqency * scale) + "%";
|
||||
|
||||
return part;
|
||||
}
|
||||
@ -79,8 +79,8 @@ export class LegendComponent implements OnInit,AfterViewInit {
|
||||
}
|
||||
|
||||
public getPercentage(renderer: IRenderer, index: number): number {
|
||||
const scale = 100 / renderer.band.histogram.entries.reduce((sum, entry) => sum + entry.freqency, 0);
|
||||
const percent = renderer.band.histogram.entries[index].freqency * scale;
|
||||
let scale = 100 / renderer.band.histogram.entries.reduce((sum, entry) => sum + entry.freqency, 0);
|
||||
let percent = renderer.band.histogram.entries[index].freqency * scale;
|
||||
return percent < 0.1 ? null : percent;
|
||||
}
|
||||
|
||||
|
||||
@ -2,23 +2,23 @@
|
||||
<div class="col-8 nopadding"><span i18n>Data points</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.populationCount}}</div>
|
||||
<div class="col-8 nopadding"><span i18n>Min</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.min)| number:'1.0-2'}}</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.min| number:'1.0-2'}}</div>
|
||||
<div class="col-8 nopadding"><span i18n>Max</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.max)| number:'1.0-2'}}</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.max| number:'1.0-2'}}</div>
|
||||
<div class="col-8 nopadding"><span i18n>Min+1</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.minPlus)| number:'1.0-2'}}</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.minPlus| number:'1.0-2'}}</div>
|
||||
<div class="col-8 nopadding"><span i18n>Max-1</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.maxMinus)| number:'1.0-2'}}</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.maxMinus| number:'1.0-2'}}</div>
|
||||
|
||||
<div class="col-8 nopadding"><span i18n>Average</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.mean)| number:'1.0-2'}}</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.mean| number:'1.0-2'}}</div>
|
||||
<div class="col-8 nopadding"><span i18n>Standard deviation</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.stddev)| number:'1.0-2'}}</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.stddev| number:'1.0-2'}}</div>
|
||||
|
||||
<div class="col-8 nopadding"><span i18n>Mode</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.mode)| number:'1.0-2'}}</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.mode| number:'1.0-2'}}</div>
|
||||
<div class="col-8 nopadding"><span i18n>Median</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.median)| number:'1.0-2'}}</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.median| number:'1.0-2'}}</div>
|
||||
|
||||
<div class="col-8 nopadding"><span i18n>Kurtosis</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.curtosis| number:'1.0-2'}}</div>
|
||||
@ -26,11 +26,11 @@
|
||||
<div class="col-4 pull-left nopadding">{{statistics.skewness| number:'1.0-2'}}</div>
|
||||
|
||||
<div class="col-8 nopadding"><span i18n>Variance</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{getSquaredScaledValue(statistics.variance)| number:'1.0-2'}}</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.variance| number:'1.0-2'}}</div>
|
||||
<div class="col-8 nopadding"><span i18n>Coefficient of variation</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.variationCoefficient | number:'1.0-2'}}</div>
|
||||
<ng-container *ngIf="statistics.confidenceIntervalLow !== undefined">
|
||||
<div class="col-8 nopadding">90% <span i18n>Confidence interval</span>:</div>
|
||||
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.confidenceIntervalLow) | number:'1.0-2'}} - {{getScaledValue(statistics.confidenceIntervalHigh) | number:'1.0-2'}}</div>
|
||||
<div class="col-4 pull-left nopadding">{{statistics.confidenceIntervalLow | number:'1.0-2'}} - {{statistics.confidenceIntervalHigh | number:'1.0-2'}}</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
|
||||
@ -1,35 +1,16 @@
|
||||
import { Component, Input } from '@angular/core';
|
||||
import { IStatistics } from '../../../models/color.map';
|
||||
import {Component, Input} from '@angular/core';
|
||||
import {IStatistics} from '../../../models/color.map';
|
||||
|
||||
@Component({
|
||||
selector: 'fm-map-statistics-details',
|
||||
templateUrl: './statistics-details.component.html',
|
||||
styles: ['.nopadding{\n' +
|
||||
' padding: 0 !important;\n' +
|
||||
' margin: 0 !important;\n' +
|
||||
'}']
|
||||
' padding: 0 !important;\n' +
|
||||
' margin: 0 !important;\n' +
|
||||
'}']
|
||||
})
|
||||
export class StatisticsDetailsComponent {
|
||||
|
||||
@Input()
|
||||
statistics: IStatistics;
|
||||
@Input()
|
||||
scale: number | null;
|
||||
|
||||
public getScaledValue(value: number): number {
|
||||
let v = value;
|
||||
if (this.scale && this.scale != 0) {
|
||||
v = this.scale * value;
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
public getSquaredScaledValue(value: number): number {
|
||||
let v = value;
|
||||
if (this.scale && this.scale != 0) {
|
||||
v = (this.scale * this.scale) * value;
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
div.map-search {
|
||||
position: absolute;
|
||||
top: 0.5rem;
|
||||
@ -104,7 +106,7 @@ div.map-search.searchcollapsed button[type="submit"] {
|
||||
}
|
||||
|
||||
.form-control, .form-control:focus {
|
||||
border-color: var(--bs-secondary);
|
||||
border-color: $secondary;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -50,21 +50,21 @@ export class MapSearchComponent {
|
||||
}
|
||||
}
|
||||
|
||||
public collapsedLocal = true;
|
||||
public searchMinifiedLocal = false;
|
||||
public collapsedLocal: boolean = true;
|
||||
public searchMinifiedLocal: boolean = false;
|
||||
public periodLocal: IPeriodState = { startDate:new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1), endDate:new Date(Date.now())};
|
||||
public filterOptionsLocal: IQueryState;
|
||||
private extent: number[];
|
||||
public searchTextLocal: any;
|
||||
public searchTextLocalOutput: string;
|
||||
public dateFilter = true;
|
||||
public dateFilter: boolean = true;
|
||||
public startEndCaption: string = this.timespanService.getCaption(this.periodLocal.startDate, this.periodLocal.endDate, 4);
|
||||
|
||||
searching = false;
|
||||
searchFailed = false;
|
||||
hideSearchingWhenUnsubscribed = new Observable(() => () => this.searching = false);
|
||||
|
||||
public disabled = true;
|
||||
public disabled: boolean = true;
|
||||
|
||||
constructor(private typeaheadService: TypeaheadService, private timespanService: TimespanService) {
|
||||
this.filterOptionsLocal = { query: "", tags: "", startDate: null, endDate: null, bboxFilter: false, itemType: null, itemCode:null,level:0,parentCode:null,bbox:[] };
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
panelVisible:panelVisible$|async,
|
||||
openedModalName:openedModalName$|async,
|
||||
panelCollapsed:panelCollapsed$|async,
|
||||
panelExtraWide:panelExtraWide$|async,
|
||||
searchMinified:searchMinified$|async,
|
||||
selectedItem:selectedItem$|async,
|
||||
parentItem:parentItem$|async,
|
||||
@ -65,7 +64,7 @@
|
||||
</div>
|
||||
<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-top bg-secondary" *ngIf="!(state.searchMinified)">
|
||||
</div>
|
||||
@ -85,7 +84,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</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>
|
||||
</fm-side-panel>
|
||||
</div>
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
aol-map { position:absolute;width:100%;height:calc( 100vh );}
|
||||
|
||||
.arrow {
|
||||
@ -193,7 +195,7 @@ timespan.menuVisible {
|
||||
width: 4rem;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
color: var(--bs-primary);
|
||||
color: $primary;
|
||||
}
|
||||
|
||||
.shortcut-icon > .farm-icon {
|
||||
|
||||
@ -45,7 +45,7 @@ import * as style from 'ol/style';
|
||||
})
|
||||
|
||||
export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
title = 'Map';
|
||||
title: string = 'Map';
|
||||
public openedModalName$: Observable<string> = this.store.select(commonReducers.selectOpenedModalName);
|
||||
public itemTypes$: Observable<{ [id: string]: IItemType }>;
|
||||
public mapState$: Observable<IMapState> = this.store.select(mapReducers.selectGetMapState);
|
||||
@ -66,7 +66,6 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
|
||||
public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
|
||||
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 clickedFeature: Subject<Feature<Geometry>> = new Subject<Feature<Geometry>>();
|
||||
public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
|
||||
@ -82,20 +81,20 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
public query$: Observable<IQuery> = this.store.select(mapReducers.selectGetQuery);
|
||||
public position$: Observable<GeolocationPosition> = this.geolocationService.getCurrentPosition();
|
||||
public compassHeading$: Observable<number> = this.deviceorientationService.getCurrentCompassHeading();
|
||||
public baseLayersCollapsed = true;
|
||||
public overlayLayersCollapsed = true;
|
||||
public baseLayersCollapsed:boolean = true;
|
||||
public overlayLayersCollapsed: boolean = true;
|
||||
public extent$: Observable<Extent> = this.store.select(mapReducers.selectGetExtent);
|
||||
public styles$:Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
|
||||
public fullscreen$: Observable<boolean> = this.store.select(commonReducers.selectGetFullScreen);
|
||||
private lastUrl = "";
|
||||
private initialized = false;
|
||||
public noContent = false;
|
||||
public overrideSelectedItemLayer = false;
|
||||
public overrideOverlayLayers = false;
|
||||
public dataLayerSlideValue = 50;
|
||||
private initialized: boolean = false;
|
||||
public noContent: boolean = false;
|
||||
public overrideSelectedItemLayer: boolean = false;
|
||||
public overrideOverlayLayers: boolean = false;
|
||||
public dataLayerSlideValue:number = 50;
|
||||
public dataLayerSlideEnabled = false;
|
||||
private visibleAreaBottom = 0;
|
||||
private viewEnabled = true;
|
||||
private viewEnabled: boolean = true;
|
||||
|
||||
@ViewChild('map') map;
|
||||
@ViewChild('contentDiv') contentDiv: ElementRef;
|
||||
@ -113,18 +112,18 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
private deviceorientationService:DeviceOrientationService,
|
||||
public devicesService:DeviceService) {
|
||||
if(route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-map"]) {
|
||||
const params = route.snapshot.data["fm-map-map"];
|
||||
let params = route.snapshot.data["fm-map-map"];
|
||||
this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false;
|
||||
this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false;
|
||||
}
|
||||
this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query,mapState]) =>{
|
||||
if(query && query.querystate) {
|
||||
let newQueryState = tassign(mapReducers.initialQueryState);
|
||||
//console.debug(`Do Query`);
|
||||
const urlparts=[];
|
||||
console.debug(`Do Query`);
|
||||
let urlparts=[];
|
||||
if (query.querystate.itemCode && query.querystate.itemCode != "") {
|
||||
if(query.querystate.itemType && query.querystate.itemType!= "") {
|
||||
const itemType = this.itemTypeService.itemTypes[query.querystate.itemType];
|
||||
let itemType = this.itemTypeService.itemTypes[query.querystate.itemType];
|
||||
if (itemType && itemType.viewer && itemType.viewer == "edit_in_editor" && itemType.editor) {
|
||||
urlparts.push('/editor');
|
||||
urlparts.push(itemType.editor);
|
||||
@ -155,7 +154,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
|
||||
@HostListener('document:keyup', ['$event'])
|
||||
escapeClose(event: KeyboardEvent) {
|
||||
const x = event.keyCode;
|
||||
let x = event.keyCode;
|
||||
if (x === 27) {
|
||||
this.handleCloseModal()
|
||||
}
|
||||
@ -193,7 +192,6 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
}
|
||||
|
||||
handleFeatureClick(feature: Feature<Geometry>) {
|
||||
this.store.dispatch(new mapActions.ClickFeature(feature));
|
||||
this.clickedFeature.next(feature);
|
||||
}
|
||||
|
||||
@ -209,18 +207,12 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
if(component && component.hasOwnProperty('clickedFeature')) {
|
||||
(component as IClickedFeature).clickedFeature = this.clickedFeature;
|
||||
}
|
||||
if(component && component.hasOwnProperty('extrawide')) {
|
||||
this.store.dispatch(new mapActions.SetPanelExtraWide(true));
|
||||
}
|
||||
}
|
||||
|
||||
handleSidepaneloutletDeactivate(component:any) {
|
||||
if(component && component.hasOwnProperty('clickedFeature')) {
|
||||
(component as IClickedFeature).clickedFeature = null;
|
||||
}
|
||||
if(component && component.hasOwnProperty('extrawide')) {
|
||||
this.store.dispatch(new mapActions.SetPanelExtraWide(false));
|
||||
}
|
||||
}
|
||||
|
||||
handlePrerender(event:any) {
|
||||
@ -250,7 +242,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
|
||||
ngOnInit() {
|
||||
this.initialized = false;
|
||||
//console.debug("Init");
|
||||
console.debug("Init");
|
||||
this.store.dispatch(new mapActions.Clear());
|
||||
this.selectedFeatures$.next({x:0,y:0,features:[]});
|
||||
this.selectedFeatures$.next(null);
|
||||
@ -276,19 +268,19 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
}
|
||||
|
||||
round(value:number,decimals:number):number {
|
||||
const d = Math.pow(10, decimals);
|
||||
let d = Math.pow(10, decimals);
|
||||
return Math.round((value + Number.EPSILON)*d)/d;
|
||||
}
|
||||
|
||||
getMapStateFromUrl(params:ParamMap):IMapState {
|
||||
const hasUrlmapState = params.has("xCenter") && params.has("yCenter");
|
||||
var hasUrlmapState = params.has("xCenter") && params.has("yCenter");
|
||||
if (hasUrlmapState) {
|
||||
const xCenter = parseFloat(params.get("xCenter"));
|
||||
const yCenter = parseFloat(params.get("yCenter"));
|
||||
const zoom = parseFloat(params.get("zoom"));
|
||||
const rotation = parseFloat(params.get("rotation"));
|
||||
const baseLayer = params.get("baseLayer")?params.get("baseLayer"):"";
|
||||
const newMapState = {zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer };
|
||||
let xCenter = parseFloat(params.get("xCenter"));
|
||||
let yCenter = parseFloat(params.get("yCenter"));
|
||||
let zoom = parseFloat(params.get("zoom"));
|
||||
let rotation = parseFloat(params.get("rotation"));
|
||||
let baseLayer = params.get("baseLayer")?params.get("baseLayer"):"";
|
||||
var newMapState = {zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer };
|
||||
return newMapState;
|
||||
} else {
|
||||
return null;
|
||||
@ -310,8 +302,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
|
||||
getQueryStateFromUrl(params:ParamMap):IQueryState {
|
||||
if (params.has("queryState")) {
|
||||
const queryState = params.get("queryState");
|
||||
let newQueryState = tassign(mapReducers.initialQueryState);
|
||||
let queryState = params.get("queryState");
|
||||
var newQueryState = tassign(mapReducers.initialQueryState);
|
||||
if (queryState != "") {
|
||||
newQueryState = this.serializeService.deserialize(queryState);
|
||||
}
|
||||
@ -322,7 +314,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
}
|
||||
|
||||
ngAfterViewInit() {
|
||||
//console.debug("View init");
|
||||
console.debug("View init");
|
||||
this.noContent=true;
|
||||
this.route.children.forEach((entry) => {
|
||||
if(entry.outlet=="primary") {
|
||||
@ -334,8 +326,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
|
||||
// url to state
|
||||
|
||||
const urlMapState = this.getMapStateFromUrl(this.route.snapshot.paramMap);
|
||||
const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap);
|
||||
let urlMapState = this.getMapStateFromUrl(this.route.snapshot.paramMap);
|
||||
let urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap);
|
||||
if(urlQueryState && urlMapState && this.noContent) {
|
||||
this.store.dispatch(new mapActions.SetState(urlMapState,urlQueryState));
|
||||
window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(urlMapState));
|
||||
@ -347,7 +339,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
|
||||
this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$),switchMap(([params,state]) => {
|
||||
if(this.initialized && this.noContent) {
|
||||
const urlQueryState = this.getQueryStateFromUrl(params);
|
||||
let urlQueryState = this.getQueryStateFromUrl(params);
|
||||
if( this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState)) {
|
||||
return of(new mapActions.SetState(state.mapState,urlQueryState));
|
||||
}
|
||||
@ -356,7 +348,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
})).subscribe((action) => {
|
||||
if(action) {
|
||||
this.zone.run(() => {
|
||||
//console.debug("Url to state");
|
||||
console.debug("Url to state");
|
||||
this.store.dispatch(action);
|
||||
});
|
||||
}
|
||||
@ -365,7 +357,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
// state to url
|
||||
|
||||
this.stateSub = this.state$.pipe(switchMap((state) => {
|
||||
const newUrl = this.serializeMapState(state.mapState) + "_" + this.serializeService.serialize(state.queryState);
|
||||
let newUrl = this.serializeMapState(state.mapState) + "_" + this.serializeService.serialize(state.queryState);
|
||||
if(this.lastUrl!=newUrl) {
|
||||
this.lastUrl=newUrl;
|
||||
return of(state);
|
||||
@ -373,9 +365,9 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
else {
|
||||
return of(null);
|
||||
}
|
||||
})).subscribe((newUrlState: any) => {
|
||||
})).subscribe((newUrlState) =>{
|
||||
if(newUrlState) {
|
||||
//console.debug(`State to url`);
|
||||
console.debug(`State to url`);
|
||||
this.replaceUrl(newUrlState.mapState,newUrlState.queryState,newUrlState.replaceUrl);
|
||||
}
|
||||
});
|
||||
@ -413,19 +405,19 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
|
||||
handlePredefinedQuery(event: MouseEvent, query: any) {
|
||||
event.preventDefault();
|
||||
const queryState = tassign(mapReducers.initialQueryState, query);
|
||||
var queryState = tassign(mapReducers.initialQueryState, query);
|
||||
this.store.dispatch(new mapActions.DoQuery(queryState));
|
||||
}
|
||||
|
||||
replaceUrl(mapState: IMapState, queryState: IQueryState, replace = true) {
|
||||
replaceUrl(mapState: IMapState, queryState: IQueryState, replace: boolean = true) {
|
||||
if(this.noContent) {
|
||||
const newMapState = this.serializeMapState(mapState);
|
||||
const newQueryState = this.serializeService.serialize(queryState);
|
||||
const currentMapState = this.serializeMapState(this.getMapStateFromUrl(this.route.snapshot.paramMap));
|
||||
const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap);
|
||||
const currentQueryState = urlQueryState==null?"":this.serializeService.serialize(urlQueryState);
|
||||
let newMapState = this.serializeMapState(mapState);
|
||||
let newQueryState = this.serializeService.serialize(queryState);
|
||||
let currentMapState = this.serializeMapState(this.getMapStateFromUrl(this.route.snapshot.paramMap));
|
||||
let urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap);
|
||||
let currentQueryState = urlQueryState==null?"":this.serializeService.serialize(urlQueryState);
|
||||
if(mapState.baseLayerCode!="" && ((newMapState!= currentMapState) || (newQueryState!=currentQueryState))) {
|
||||
const parts =["."];
|
||||
let parts =["."];
|
||||
parts.push(mapState.xCenter.toFixed(5));
|
||||
parts.push(mapState.yCenter.toFixed(5));
|
||||
parts.push( mapState.zoom.toFixed(0));
|
||||
@ -433,7 +425,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
parts.push(mapState.baseLayerCode);
|
||||
parts.push( this.serializeService.serialize(queryState));
|
||||
|
||||
//console.debug("Replace url",parts);
|
||||
console.debug("Replace url",parts);
|
||||
this.router.navigate(parts, { replaceUrl: replace,relativeTo:this.route.parent });
|
||||
}
|
||||
}
|
||||
@ -442,20 +434,20 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
handleOnMoveEnd(event) {
|
||||
if(this.initialized && this.viewEnabled) {
|
||||
this.zone.run(() =>{
|
||||
//console.debug("Move end");
|
||||
const map = event.map;
|
||||
const view = map.getView();
|
||||
const rotation = view.getRotation();
|
||||
const zoom = view.getZoom();
|
||||
const center = transform(view.getCenter(), view.getProjection(), "EPSG:4326");
|
||||
const viewExtent = view.calculateExtent(this.map.instance.getSize());
|
||||
const mapState: IMapState = { xCenter: center[0], yCenter: center[1], zoom: zoom, rotation: rotation, baseLayerCode: null };
|
||||
const state = { mapState: mapState, viewExtent: viewExtent };
|
||||
//console.debug("Center: ",center[0],center[1] );
|
||||
const source = from([state]);
|
||||
console.debug("Move end");
|
||||
var map = event.map;
|
||||
var view = map.getView();
|
||||
var rotation = view.getRotation();
|
||||
var zoom = view.getZoom();
|
||||
var center = transform(view.getCenter(), view.getProjection(), "EPSG:4326");
|
||||
var viewExtent = view.calculateExtent(this.map.instance.getSize());
|
||||
let mapState: IMapState = { xCenter: center[0], yCenter: center[1], zoom: zoom, rotation: rotation, baseLayerCode: null };
|
||||
let state = { mapState: mapState, viewExtent: viewExtent };
|
||||
console.debug("Center: ",center[0],center[1] );
|
||||
let source = from([state]);
|
||||
source.pipe(withLatestFrom(this.selectedBaseLayer$)).subscribe(([state, baselayer]) => {
|
||||
if (mapState && baselayer) { // do not react on first move
|
||||
const newMapState = tassign(state.mapState, { baseLayerCode: baselayer.item.code });
|
||||
let newMapState = tassign(state.mapState, { baseLayerCode: baselayer.item.code });
|
||||
this.store.dispatch(new mapActions.SetMapState(newMapState));
|
||||
this.store.dispatch(new mapActions.SetViewExtent(state.viewExtent));
|
||||
}
|
||||
@ -499,7 +491,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
}
|
||||
|
||||
handleZoomToExtent(itemLayer: IItemLayer) {
|
||||
const extent = createEmpty();
|
||||
var extent = createEmpty();
|
||||
extend(extent, itemLayer.layer.getExtent());
|
||||
if (extent) {
|
||||
this.store.dispatch(new mapActions.SetExtent(extent));
|
||||
@ -521,10 +513,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
||||
handleCitySearch(location:string) {
|
||||
this.geolocaterService.geocode(location).subscribe(locations => {
|
||||
if( locations.length > 0) {
|
||||
const point = new Point([locations[0].coordinates.lon,locations[0].coordinates.lat]);
|
||||
let point = new Point([locations[0].coordinates.lon,locations[0].coordinates.lat]);
|
||||
point.transform('EPSG:4326', 'EPSG:3857');
|
||||
const circle = new Circle(point.getCoordinates(),5000);//
|
||||
const extent = createEmpty();
|
||||
let circle = new Circle(point.getCoordinates(),5000);//
|
||||
let extent = createEmpty();
|
||||
extend(extent, circle.getExtent());
|
||||
this.store.dispatch(new mapActions.SetExtent(extent))
|
||||
}
|
||||
|
||||
@ -15,12 +15,12 @@ export interface IMetaData {
|
||||
})
|
||||
export class MetaDataModalComponent {
|
||||
|
||||
private modalName = 'metaDataModal';
|
||||
private modalName: string = 'metaDataModal';
|
||||
private modalRef: NgbModalRef;
|
||||
|
||||
@ViewChild('content', { static: true }) _templateModal:ElementRef;
|
||||
@Input() droppedFile: IDroppedFile;
|
||||
@Input() set modalState(_modalState:any) {
|
||||
@Input() set modalState(_modalState:any) {;
|
||||
if(_modalState == this.modalName) {
|
||||
this.openModal()
|
||||
} else if(this.modalRef) {
|
||||
|
||||
@ -22,7 +22,7 @@ const after = (one: NgbDateStruct, two: NgbDateStruct) =>
|
||||
})
|
||||
export class SelectPeriodModalComponent {
|
||||
|
||||
private modalName = 'selectPeriodModal';
|
||||
private modalName: string = 'selectPeriodModal';
|
||||
private modalRef: NgbModalRef;
|
||||
private dateAdapter = new NgbDateNativeAdapter();
|
||||
hoveredDate: NgbDateStruct;
|
||||
@ -31,7 +31,7 @@ export class SelectPeriodModalComponent {
|
||||
|
||||
@ViewChild('content', { static: true }) _templateModal:ElementRef;
|
||||
|
||||
@Input() set modalState(_modalState:any) {
|
||||
@Input() set modalState(_modalState:any) {;
|
||||
if(_modalState == this.modalName) {
|
||||
this.openModal()
|
||||
} else if(this.modalRef) {
|
||||
@ -44,7 +44,7 @@ export class SelectPeriodModalComponent {
|
||||
}
|
||||
|
||||
@Input() set endDate(_modalState: Date) {
|
||||
const d = new Date(_modalState);
|
||||
var d = new Date(_modalState);
|
||||
d.setDate(d.getDate() - 1);
|
||||
this.toDate = this.dateAdapter.fromModel(d);
|
||||
}
|
||||
@ -80,7 +80,7 @@ export class SelectPeriodModalComponent {
|
||||
handleSelect(event:MouseEvent) {
|
||||
event.preventDefault();
|
||||
if (this.fromDate && this.toDate && before(this.fromDate, this.toDate)) {
|
||||
const endDate = new Date(this.dateAdapter.toModel(this.toDate));
|
||||
var endDate = new Date(this.dateAdapter.toModel(this.toDate));
|
||||
endDate.setDate(endDate.getDate() + 1);
|
||||
this.onSelect.emit({startDate:this.dateAdapter.toModel(this.fromDate),endDate:endDate})
|
||||
}
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
|
||||
|
||||
.row {
|
||||
border-bottom: 1px solid var(--bs-gray-500);
|
||||
border-bottom: 1px solid $gray-500;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.row:hover {
|
||||
background-color: var(--bs-gray-100);
|
||||
background-color: $gray-100;
|
||||
}
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ export class SelectedItemContainerComponent {
|
||||
|
||||
let selected = -1;
|
||||
let maxMatches =0;
|
||||
const showItem = true;
|
||||
let showItem = true;
|
||||
for (let i = 0; i < this.selectedItemComponents.length; i++) {
|
||||
let matches=0;
|
||||
let criteria=0;
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
.big-icon {
|
||||
width: 100%;
|
||||
color: white;
|
||||
|
||||
@ -31,28 +31,28 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
|
||||
areaInHa(item:IItem):number {
|
||||
if(!item) return 0;
|
||||
// get area from faeture if 0 calculate from polygon
|
||||
const a = item.data.area;
|
||||
let a = item.data.area;
|
||||
if(a) return a;
|
||||
const format = new GeoJSON();
|
||||
const polygon = format.readGeometry(item.geometry);
|
||||
let format = new GeoJSON();
|
||||
let polygon = format.readGeometry(item.geometry);
|
||||
return getArea(polygon,{projection:"EPSG:4326"}) / 10000;
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
const childItems = this.folderService$.getItems(this.item.code, 0, 1000);
|
||||
const atLocationItems = this.itemService$.getItemList(null,null,null,this.item.code,true);
|
||||
var childItems = this.folderService$.getItems(this.item.code, 0, 1000);
|
||||
var atLocationItems = this.itemService$.getItemList(null,null,null,this.item.code,true);
|
||||
this.items = childItems.pipe(
|
||||
combineLatest(atLocationItems),
|
||||
switchMap(([ci,ali]) => {
|
||||
const retVal:IListItem[] = [];
|
||||
const codes = {};
|
||||
let retVal:IListItem[] = [];
|
||||
let codes = {};
|
||||
ci.forEach((listItem) => {
|
||||
retVal.push(listItem);
|
||||
codes[listItem.code]=listItem;
|
||||
});
|
||||
ali.forEach((atlocationitem) => {
|
||||
const listItem = atlocationitem as IListItem;
|
||||
const allowedItemTypes = "vnd.farmmaps.itemtype.device.senml"; // this is a hack
|
||||
let listItem = atlocationitem as IListItem;
|
||||
let allowedItemTypes = "vnd.farmmaps.itemtype.device.senml"; // this is a hack
|
||||
if(!codes[listItem.code] && allowedItemTypes.indexOf(listItem.itemType) >= 0) {
|
||||
retVal.push(listItem);
|
||||
}
|
||||
|
||||
@ -25,7 +25,6 @@
|
||||
<li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i> <span i18n>Add as 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>
|
||||
<li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li>
|
||||
</ul>
|
||||
</div>
|
||||
<fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
.big-icon {
|
||||
width: 100%;
|
||||
color: white;
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
.big-icon {
|
||||
width: 100%;
|
||||
color: white;
|
||||
|
||||
@ -23,7 +23,7 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
|
||||
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
|
||||
super(store, itemTypeService,location,router);
|
||||
}
|
||||
public selectedLayer = 0;
|
||||
public selectedLayer: number = 0;
|
||||
|
||||
onLayerChanged(layerIndex: number) {
|
||||
this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
.big-icon {
|
||||
width: 100%;
|
||||
color: white;
|
||||
|
||||
@ -46,7 +46,7 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
|
||||
}
|
||||
|
||||
selectedItem():IItem {
|
||||
const temporalItemLayer = this.itemLayer as ITemporalItemLayer;
|
||||
let temporalItemLayer = this.itemLayer as ITemporalItemLayer;
|
||||
if(temporalItemLayer && temporalItemLayer.selectedItemLayer) {
|
||||
return temporalItemLayer.selectedItemLayer.item;
|
||||
}
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
.big-icon {
|
||||
width: 100%;
|
||||
color: white;
|
||||
|
||||
@ -20,39 +20,39 @@ export abstract class AbstractSelectedItemComponent {
|
||||
|
||||
handleOnView(item: IItem) {
|
||||
if (this.itemTypeService.hasViewer(item)) {
|
||||
const viewer = this.itemTypeService.itemTypes[item.itemType].viewer;
|
||||
const url = `/viewer/${viewer}/item/${item.code}`;
|
||||
let viewer = this.itemTypeService.itemTypes[item.itemType].viewer;
|
||||
let url = `/viewer/${viewer}/item/${item.code}`;
|
||||
this.router.navigate([url]);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
handleOnEdit(item: IItem) {
|
||||
let editor = "property";
|
||||
var editor = "property";
|
||||
if(this.itemTypeService.hasEditor(item)) {
|
||||
editor = this.itemTypeService.itemTypes[item.itemType].editor;
|
||||
}
|
||||
const url = `/editor/${editor}/item/${item.code}`
|
||||
let url = `/editor/${editor}/item/${item.code}`
|
||||
this.router.navigate([url]);
|
||||
return false;
|
||||
}
|
||||
|
||||
handleAddAsLayer(item: IItem,layerIndex = -1) {
|
||||
handleAddAsLayer(item: IItem,layerIndex:number = -1) {
|
||||
this.store.dispatch(new mapActions.AddLayer(item,layerIndex));
|
||||
return false;
|
||||
}
|
||||
|
||||
handleRemoveLayer(item: IItem,layerIndex = -1) {
|
||||
const itemLayer = this.getItemLayer(item,layerIndex);
|
||||
handleRemoveLayer(item: IItem,layerIndex:number = -1) {
|
||||
let itemLayer = this.getItemLayer(item,layerIndex);
|
||||
if(itemLayer) {
|
||||
this.store.dispatch(new mapActions.RemoveLayer(itemLayer));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
getItemLayer(item:IItem,layerIndex = -1):IItemLayer {
|
||||
const li = layerIndex==-1?0:layerIndex;
|
||||
const selected = this.overlayLayers.filter(ol => ol.item.code == item.code && ol.layerIndex == li);
|
||||
getItemLayer(item:IItem,layerIndex:number = -1):IItemLayer {
|
||||
let li = layerIndex==-1?0:layerIndex;
|
||||
let selected = this.overlayLayers.filter(ol => ol.item.code == item.code && ol.layerIndex == li);
|
||||
if(selected.length==0) return null;
|
||||
return selected[0];
|
||||
}
|
||||
|
||||
@ -1,34 +1,34 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
|
||||
import { Store, Action, createFeatureSelector } from '@ngrx/store';
|
||||
import { Store, Action,createFeatureSelector } from '@ngrx/store';
|
||||
import { ROUTER_NAVIGATED, RouterReducerState } from '@ngrx/router-store';
|
||||
import * as fromRouter from '@ngrx/router-store';
|
||||
import { createEffect, Actions, ofType } from '@ngrx/effects';
|
||||
import { createEffect, Actions,ofType } from '@ngrx/effects';
|
||||
|
||||
import { EMPTY, Observable, of } from 'rxjs';
|
||||
import { EMPTY, Observable , of} from 'rxjs';
|
||||
import { withLatestFrom, switchMap, map, catchError, mergeMap } from 'rxjs/operators';
|
||||
|
||||
import { GeoJSON, WKT } from 'ol/format';
|
||||
import { Feature } from 'ol';
|
||||
import { getCenter, createEmpty, extend } from 'ol/extent';
|
||||
import { Point, Geometry } from 'ol/geom'
|
||||
import {GeoJSON,WKT} from 'ol/format';
|
||||
import {Feature} from 'ol';
|
||||
import { getCenter,createEmpty,extend } from 'ol/extent';
|
||||
import {Point,Geometry} from 'ol/geom'
|
||||
|
||||
|
||||
import * as mapActions from '../actions/map.actions';
|
||||
import * as mapReducers from '../reducers/map.reducer';
|
||||
import { commonReducers } from '@farmmaps/common';
|
||||
import {commonReducers} from '@farmmaps/common';
|
||||
|
||||
import { commonActions } from '@farmmaps/common';
|
||||
import {commonActions} from '@farmmaps/common';
|
||||
|
||||
import { IItem } from '@farmmaps/common';
|
||||
import { FolderService, ItemService } from '@farmmaps/common';
|
||||
import { tassign } from 'tassign';
|
||||
|
||||
import { FeatureIconService } from '../services/feature-icon.service';
|
||||
import {FeatureIconService} from '../services/feature-icon.service';
|
||||
|
||||
import * as style from 'ol/style';
|
||||
|
||||
import { ItemTypeService, IQueryState } from '@farmmaps/common';
|
||||
import { ItemTypeService,IQueryState } from '@farmmaps/common';
|
||||
import { TemporalItemLayer } from '../models/item.layer'
|
||||
|
||||
export const getRouterState = createFeatureSelector<RouterReducerState>('router');
|
||||
@ -41,40 +41,40 @@ export const {
|
||||
selectRouteParam, // factory function to select a route param
|
||||
selectRouteData, // select the current route data
|
||||
selectUrl, // select the current url
|
||||
} = fromRouter.getRouterSelectors(getRouterState);
|
||||
} = fromRouter.getSelectors(getRouterState);
|
||||
|
||||
|
||||
@Injectable()
|
||||
export class MapEffects {
|
||||
private _geojsonFormat: GeoJSON;
|
||||
private _wktFormat: WKT;
|
||||
private overrideSelectedItemLayer = false;
|
||||
private overrideSelectedItemLayer: boolean = false;
|
||||
|
||||
private updateFeatureGeometry(feature: Feature<Geometry>, updateEvent: commonActions.DeviceUpdateEvent): Feature<Geometry> {
|
||||
const newFeature = feature.clone();
|
||||
const f = this._wktFormat.readFeature(updateEvent.attributes["geometry"], {
|
||||
private updateFeatureGeometry(feature:Feature<Geometry>, updateEvent:commonActions.DeviceUpdateEvent): Feature<Geometry> {
|
||||
let newFeature = feature.clone();
|
||||
var f = this._wktFormat.readFeature(updateEvent.attributes["geometry"],{
|
||||
dataProjection: 'EPSG:4326',
|
||||
featureProjection: 'EPSG:3857'
|
||||
});
|
||||
const centroid = getCenter(f.getGeometry().getExtent());
|
||||
var centroid = getCenter(f.getGeometry().getExtent());
|
||||
newFeature.setId(feature.getId());
|
||||
newFeature.setGeometry(new Point(centroid));
|
||||
return newFeature;
|
||||
}
|
||||
|
||||
init$ = createEffect(() => this.actions$.pipe(
|
||||
init$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.INIT),
|
||||
withLatestFrom(this.store$.select(commonReducers.selectGetRootItems)),
|
||||
switchMap(([action, rootItems]) => {
|
||||
const actions = [];
|
||||
for (const rootItem of rootItems) {
|
||||
let actions=[];
|
||||
for (let rootItem of rootItems) {
|
||||
if (rootItem.itemType == "UPLOADS_FOLDER") actions.push(new mapActions.SetParent(rootItem.code));
|
||||
}
|
||||
// initialize default feature styles
|
||||
actions.push(new mapActions.SetStyle('file', new style.Style({
|
||||
actions.push(new mapActions.SetStyle('file',new style.Style({
|
||||
image: new style.Icon({
|
||||
anchor: [0.5, 1],
|
||||
scale: 0.05,
|
||||
anchor: [0.5, 1],
|
||||
scale: 0.05,
|
||||
src: this.featureIconService$.getIconImageDataUrl("fal fa-file")
|
||||
}),
|
||||
stroke: new style.Stroke({
|
||||
@ -85,7 +85,7 @@ export class MapEffects {
|
||||
color: 'rgba(0, 0, 0,0)'
|
||||
})
|
||||
})));
|
||||
actions.push(new mapActions.SetStyle('selected', new style.Style({
|
||||
actions.push(new mapActions.SetStyle('selected',new style.Style({
|
||||
image: new style.Icon({
|
||||
anchor: [0.5, 1],
|
||||
scale: 0.08,
|
||||
@ -104,13 +104,13 @@ export class MapEffects {
|
||||
}
|
||||
)));
|
||||
|
||||
initBaseLayers$ = createEffect(() => this.actions$.pipe(
|
||||
initBaseLayers$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.INIT),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetProjection)),
|
||||
map(([action, projection]) => new mapActions.LoadBaseLayers(projection)))
|
||||
);
|
||||
|
||||
loadBaseLayers$ = createEffect(() => this.actions$.pipe(
|
||||
loadBaseLayers$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.LOADBASELAYERS),
|
||||
switchMap((action: mapActions.LoadBaseLayers) => {
|
||||
return this.itemService$.getItemList("vnd.farmmaps.itemtype.layer", { "isBaseLayer": true }).pipe(
|
||||
@ -118,22 +118,22 @@ export class MapEffects {
|
||||
catchError(error => of(new commonActions.Fail(error))));
|
||||
})));
|
||||
|
||||
startSearch$ = createEffect(() => this.actions$.pipe(
|
||||
startSearch$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.STARTSEARCH),
|
||||
switchMap((action) => {
|
||||
const a = action as mapActions.StartSearch;
|
||||
const startDate = a.queryState.startDate;
|
||||
const endDate = a.queryState.endDate;
|
||||
let newAction: Observable<Action>;
|
||||
let a = action as mapActions.StartSearch;
|
||||
var startDate = a.queryState.startDate;
|
||||
var endDate = a.queryState.endDate;
|
||||
var newAction:Observable<Action>;
|
||||
if (a.queryState.itemCode || a.queryState.parentCode || a.queryState.itemType || a.queryState.query || a.queryState.tags) {
|
||||
newAction = this.itemService$.getFeatures(a.queryState.bbox, "EPSG:3857", a.queryState.query, a.queryState.tags, startDate, endDate, a.queryState.itemType, a.queryState.parentCode, a.queryState.dataFilter, a.queryState.level).pipe(
|
||||
newAction= this.itemService$.getFeatures(a.queryState.bbox, "EPSG:3857", a.queryState.query, a.queryState.tags, startDate, endDate, a.queryState.itemType, a.queryState.parentCode, a.queryState.dataFilter, a.queryState.level).pipe(
|
||||
switchMap((features: any) => {
|
||||
for (const f of features.features) {
|
||||
for (let f of features.features) {
|
||||
if (f.properties && 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))));
|
||||
@ -144,18 +144,18 @@ export class MapEffects {
|
||||
})));
|
||||
|
||||
|
||||
zoomToExtent$ = createEffect(() => this.actions$.pipe(
|
||||
zoomToExtent$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.STARTSEARCHSUCCESS),
|
||||
mergeMap((action: mapActions.StartSearchSuccess) => {
|
||||
const actions = [];
|
||||
let actions =[];
|
||||
actions.push(new commonActions.SetMenuVisible(false));
|
||||
const extent = createEmpty();
|
||||
let extent = createEmpty();
|
||||
if (!action.query.bboxFilter) {
|
||||
if (extent) {
|
||||
for (const f of action.features) {
|
||||
if (extent) {
|
||||
for (let f of action.features) {
|
||||
extend(extent, (f as Feature<Geometry>).getGeometry().getExtent());
|
||||
}
|
||||
if (action.features && action.features.length > 0) {
|
||||
if(action.features && action.features.length >0) {
|
||||
actions.push(new mapActions.SetExtent(extent));
|
||||
}
|
||||
}
|
||||
@ -163,64 +163,64 @@ export class MapEffects {
|
||||
return actions;
|
||||
})));
|
||||
|
||||
zoomToExtent2$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.SETFEATURES),
|
||||
switchMap((action: mapActions.SetFeatures) => {
|
||||
const extent = createEmpty();
|
||||
if (extent) {
|
||||
for (const f of action.features) {
|
||||
extend(extent, (f as Feature<Geometry>).getGeometry().getExtent());
|
||||
zoomToExtent2$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.SETFEATURES),
|
||||
switchMap((action: mapActions.SetFeatures) => {
|
||||
let extent = createEmpty();
|
||||
if (extent) {
|
||||
for (let f of action.features) {
|
||||
extend(extent, (f as Feature<Geometry>).getGeometry().getExtent());
|
||||
}
|
||||
if(action.features.length>0) return of(new mapActions.SetExtent(extent));
|
||||
}
|
||||
if (action.features.length > 0) return of(new mapActions.SetExtent(extent));
|
||||
}
|
||||
return EMPTY;
|
||||
})));
|
||||
return EMPTY;
|
||||
})));
|
||||
|
||||
hideMenu$ = createEffect(() => this.actions$.pipe(
|
||||
hideMenu$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.STARTSEARCHSUCCESS),
|
||||
mergeMap((action: mapActions.StartSearchSuccess) => {
|
||||
return of(new commonActions.SetMenuVisible(false));
|
||||
})));
|
||||
|
||||
selectItem$ = createEffect(() => this.actions$.pipe(
|
||||
selectItem$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.SELECTITEM),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)),
|
||||
switchMap(([action, selectedItem]) => {
|
||||
const a = action as mapActions.SelectItem;
|
||||
const itemCode = selectedItem ? selectedItem.code : "";
|
||||
if (a.itemCode != itemCode) {
|
||||
return this.itemService$.getItem(a.itemCode).pipe(
|
||||
switchMap(child => {
|
||||
return this.itemService$.getItem(child.parentCode)
|
||||
.pipe(map(parent => {
|
||||
return { child, parent };
|
||||
}), catchError(() => { const parent: IItem = null; return of({ child, parent }) })
|
||||
);
|
||||
}),
|
||||
map(data => new mapActions.SelectItemSuccess(data.child, data.parent)),
|
||||
catchError(error => of(new commonActions.Fail(error))))
|
||||
} else {
|
||||
return [];
|
||||
switchMap(([action, selectedItem]) => {
|
||||
let a = action as mapActions.SelectItem;
|
||||
let itemCode = selectedItem ? selectedItem.code : "";
|
||||
if (a.itemCode != itemCode) {
|
||||
return this.itemService$.getItem(a.itemCode).pipe(
|
||||
switchMap(child => {
|
||||
return this.itemService$.getItem(child.parentCode)
|
||||
.pipe(map(parent => {
|
||||
return {child, parent};
|
||||
}),catchError(() => { let parent:IItem = null;return of({child,parent})})
|
||||
);
|
||||
}),
|
||||
map(data => new mapActions.SelectItemSuccess(data.child, data.parent)),
|
||||
catchError(error => of(new commonActions.Fail(error))))
|
||||
} else {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
}
|
||||
)));
|
||||
|
||||
selectItemSuccessSetLayer$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.SELECTITEMSUCCESS),
|
||||
map((action: mapActions.SelectItemSuccess) =>
|
||||
new mapActions.SetSelectedItemLayer(action.item)
|
||||
)
|
||||
));
|
||||
selectItemSuccessSetLayer$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.SELECTITEMSUCCESS),
|
||||
map((action:mapActions.SelectItemSuccess) =>
|
||||
new mapActions.SetSelectedItemLayer(action.item)
|
||||
)
|
||||
));
|
||||
|
||||
selectItemSuccess$ = createEffect(() => this.actions$.pipe(
|
||||
selectItemSuccess$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.SELECTITEMSUCCESS),
|
||||
switchMap((action: mapActions.SelectItemSuccess) => {
|
||||
if (!this.overrideSelectedItemLayer) {
|
||||
switchMap((action:mapActions.SelectItemSuccess) => {
|
||||
if(!this.overrideSelectedItemLayer) {
|
||||
return this.itemService$.getFeature(action.item.code, "EPSG:3857").pipe(
|
||||
map((feature: any) => {
|
||||
const f = this._geojsonFormat.readFeature(feature) as Feature;
|
||||
let f = this._geojsonFormat.readFeature(feature);
|
||||
f.setId(action.item.code);
|
||||
return new mapActions.AddFeatureSuccess(f);
|
||||
return new mapActions.AddFeatureSuccess(f );
|
||||
}),
|
||||
catchError(error => of(new commonActions.Fail(error))));
|
||||
} else {
|
||||
@ -229,59 +229,59 @@ export class MapEffects {
|
||||
}
|
||||
)));
|
||||
|
||||
selectItemSuccessTemporal$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.SELECTITEMSUCCESS),
|
||||
switchMap((action: mapActions.SelectItemSuccess) => {
|
||||
if (action.item.itemType == "vnd.farmmaps.itemtype.temporal") {
|
||||
return this.itemService$.getChildItemList(action.item.code, null).pipe(
|
||||
map(items => new mapActions.SelectTemporalItemsSuccess(
|
||||
items.sort((a, b) =>
|
||||
-(Date.parse(b.dataDate) - Date.parse(a.dataDate))
|
||||
)
|
||||
)),
|
||||
catchError(error => of(new commonActions.Fail(error))));
|
||||
} else {
|
||||
return [];
|
||||
selectItemSuccessTemporal$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.SELECTITEMSUCCESS),
|
||||
switchMap((action:mapActions.SelectItemSuccess) => {
|
||||
if(action.item.itemType == "vnd.farmmaps.itemtype.temporal") {
|
||||
return this.itemService$.getChildItemList(action.item.code,null).pipe(
|
||||
map(items => new mapActions.SelectTemporalItemsSuccess(
|
||||
items.sort((a, b) =>
|
||||
-(Date.parse(b.dataDate) - Date.parse(a.dataDate))
|
||||
)
|
||||
)),
|
||||
catchError(error => of(new commonActions.Fail(error))));
|
||||
} else {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
}
|
||||
)));
|
||||
|
||||
uploadedItemClick$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(commonActions.UPLOADEDFILECLICK),
|
||||
switchMap((action: commonActions.UploadedFileClick) => of(new mapActions.DoQuery(tassign(mapReducers.initialState.query.querystate, {itemCode:action.itemCode})))
|
||||
)));
|
||||
|
||||
uploadedItemClick$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(commonActions.UPLOADEDFILECLICK),
|
||||
switchMap((action: commonActions.UploadedFileClick) => of(new mapActions.DoQuery(tassign(mapReducers.initialState.query.querystate, { itemCode: action.itemCode })))
|
||||
)));
|
||||
|
||||
featureUpdate$ = createEffect(() => this.actions$.pipe(
|
||||
featureUpdate$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(commonActions.DEVICEUPDATEEVENT),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetFeatures)),
|
||||
mergeMap(([action, features]) => {
|
||||
const deviceUpdateEventAction = action as commonActions.DeviceUpdateEvent;
|
||||
let feature: Feature<Geometry> = null;
|
||||
for (const f of features) {
|
||||
let deviceUpdateEventAction = action as commonActions.DeviceUpdateEvent;
|
||||
var feature: Feature<Geometry> = null;
|
||||
for (let f of features) {
|
||||
if (f.getId() == deviceUpdateEventAction.itemCode) {
|
||||
feature = f;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (feature) {
|
||||
return of(new mapActions.UpdateFeatureSuccess(this.updateFeatureGeometry(feature, deviceUpdateEventAction)));
|
||||
return of(new mapActions.UpdateFeatureSuccess(this.updateFeatureGeometry(feature,deviceUpdateEventAction)));
|
||||
} else {
|
||||
return [];
|
||||
}
|
||||
})));
|
||||
|
||||
itemUpdate$ = createEffect(() => this.actions$.pipe(
|
||||
itemUpdate$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(commonActions.ITEMCHANGEDEVENT),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)),
|
||||
mergeMap(([action, selectedItem]) => {
|
||||
const itemChangedAction = action as commonActions.ItemChangedEvent;
|
||||
let itemChangedAction = action as commonActions.ItemChangedEvent;
|
||||
if (selectedItem && selectedItem.code == itemChangedAction.itemCode) {
|
||||
return this.itemService$.getItem(itemChangedAction.itemCode).pipe(
|
||||
switchMap(child => {
|
||||
return this.itemService$.getItem(child.parentCode)
|
||||
.pipe(map(parent => {
|
||||
return { child, parent };
|
||||
})
|
||||
return {child, parent};
|
||||
})
|
||||
);
|
||||
}),
|
||||
map(data => new mapActions.SelectItemSuccess(data.child, data.parent)),
|
||||
@ -291,13 +291,13 @@ export class MapEffects {
|
||||
}
|
||||
})));
|
||||
|
||||
getActionFromQueryState(queryState: IQueryState, inSearch: boolean): Observable<Action> | [] {
|
||||
if (!inSearch && (queryState.itemType || queryState.parentCode || queryState.itemCode || queryState.query || queryState.tags)) {
|
||||
var newAction: Action;
|
||||
getActionFromQueryState(queryState:IQueryState, inSearch:boolean):Observable<Action>|[] {
|
||||
if(!inSearch && (queryState.itemType || queryState.parentCode || queryState.itemCode || queryState.query || queryState.tags)) {
|
||||
var newAction:Action;
|
||||
if (queryState.itemCode && queryState.itemCode != "") {
|
||||
newAction = new mapActions.SelectItem(queryState.itemCode);
|
||||
newAction= new mapActions.SelectItem(queryState.itemCode);
|
||||
} else {
|
||||
newAction = new mapActions.StartSearch(queryState);
|
||||
newAction= new mapActions.StartSearch(queryState);
|
||||
}
|
||||
|
||||
} else {
|
||||
@ -306,104 +306,104 @@ export class MapEffects {
|
||||
return of(newAction);
|
||||
}
|
||||
|
||||
getLayerValue$ = createEffect(() => this.actions$.pipe(
|
||||
getLayerValue$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.GETLAYERVALUE),
|
||||
mergeMap((action: mapActions.GetLayerValue) => {
|
||||
const l = action.itemLayer.item.data["layers"][action.itemLayer.layerIndex];
|
||||
const scale = l.scale ? l.scale : 1;
|
||||
return this.itemService$.getLayerValue(action.itemLayer.item.code, action.itemLayer.layerIndex, action.x, action.y).pipe(
|
||||
mergeMap((action:mapActions.GetLayerValue) => {
|
||||
var l = action.itemLayer.item.data["layers"][action.itemLayer.layerIndex];
|
||||
var scale = l.scale?l.scale:1;
|
||||
return this.itemService$.getLayerValue(action.itemLayer.item.code,action.itemLayer.layerIndex,action.x,action.y).pipe(
|
||||
mergeMap((v: number) => {
|
||||
const a = [];
|
||||
if (v !== null) {
|
||||
if (l.renderer && l.renderer.colorMap && l.renderer.colorMap.colormapType == "manual") {
|
||||
let a=[];
|
||||
if(v !== null) {
|
||||
if(l.renderer && l.renderer.colorMap && l.renderer.colorMap.colormapType == "manual") {
|
||||
l.renderer.colorMap.entries.forEach((e) => {
|
||||
if (e.value == v && e.label) {
|
||||
v = e.label;
|
||||
return;
|
||||
}
|
||||
if(e.value == v && e.label) {
|
||||
v=e.label;
|
||||
return;
|
||||
}
|
||||
});
|
||||
a.push(new mapActions.GetLayerValueSuccess({ date: action.itemLayer.item.dataDate, value: v, layerName: l.name, quantity: "", unit: l.unit, scale: l.scale }));
|
||||
a.push(new mapActions.GetLayerValueSuccess({date:action.itemLayer.item.dataDate,value:v,layerName:l.name,quantity:"",unit:l.unit}));
|
||||
} else {
|
||||
a.push(new mapActions.GetLayerValueSuccess({ date: action.itemLayer.item.dataDate, value: v * scale, layerName: l.name, quantity: l.quantity, unit: l.unit, scale: l.scale }));
|
||||
a.push(new mapActions.GetLayerValueSuccess({date:action.itemLayer.item.dataDate,value:v*scale,layerName:l.name,quantity:l.quantity,unit:l.unit}));
|
||||
}
|
||||
}
|
||||
return a;
|
||||
}))
|
||||
}
|
||||
)));
|
||||
}
|
||||
)));
|
||||
|
||||
updateLayerValuesOnLayerAddedOrRemoved$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.ADDLAYER, mapActions.REMOVELAYER, mapActions.SELECTITEMSUCCESS, mapActions.SELECTTEMPORALITEMSSUCCESS, mapActions.NEXTTEMPORAL, mapActions.PREVIOUSTEMPORAL, mapActions.TOGGLELAYERVALUESENABLED, mapActions.SETLAYERINDEX, mapActions.SETSELECTEDITEMLAYER),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesX)),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesY)),
|
||||
map(([[action, x], y]) => new mapActions.SetLayerValuesLocation(x, y))
|
||||
updateLayerValuesOnLayerAddedOrRemoved$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.ADDLAYER,mapActions.REMOVELAYER,mapActions.SELECTITEMSUCCESS,mapActions.SELECTTEMPORALITEMSSUCCESS, mapActions.NEXTTEMPORAL,mapActions.PREVIOUSTEMPORAL,mapActions.TOGGLELAYERVALUESENABLED,mapActions.SETLAYERINDEX,mapActions.SETSELECTEDITEMLAYER),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesX)),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesY)),
|
||||
map(([[action,x],y]) => new mapActions.SetLayerValuesLocation(x,y))
|
||||
));
|
||||
|
||||
|
||||
getLayerValues$ = createEffect(() => this.actions$.pipe(
|
||||
getLayerValues$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.SETLAYERVALUESLOCATION),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItemLayer)),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesEnabled)),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetOverlayLayers)),
|
||||
mergeMap(([[[action, selected], enabled], overlayLayers]) => {
|
||||
const layers = [];
|
||||
if (selected) {
|
||||
if (selected && (selected as TemporalItemLayer).selectedItemLayer) {
|
||||
selected = (selected as TemporalItemLayer).selectedItemLayer;
|
||||
mergeMap(([[[action, selected], enabled],overlayLayers]) => {
|
||||
let layers = [];
|
||||
if(selected) {
|
||||
if(selected && (selected as TemporalItemLayer).selectedItemLayer ) {
|
||||
selected=(selected as TemporalItemLayer).selectedItemLayer;
|
||||
}
|
||||
layers.push(selected);
|
||||
}
|
||||
overlayLayers.forEach((ol) => {
|
||||
if (ol != selected) layers.push(ol);
|
||||
if(ol!=selected) layers.push(ol);
|
||||
});
|
||||
const a = action as mapActions.SetLayerValuesLocation;
|
||||
const actions = [];
|
||||
if (enabled) {
|
||||
let a = action as mapActions.SetLayerValuesLocation;
|
||||
let actions = [];
|
||||
if(enabled) {
|
||||
layers.forEach((ol) => {
|
||||
if ("vnd.farmmaps.itemtype.shape.processed,vnd.farmmaps.itemtype.geotiff.processed".indexOf(ol.item.itemType) >= 0) {
|
||||
actions.push(new mapActions.GetLayerValue(ol, a.x, a.y));
|
||||
}
|
||||
});
|
||||
if("vnd.farmmaps.itemtype.shape.processed,vnd.farmmaps.itemtype.geotiff.processed".indexOf(ol.item.itemType)>=0) {
|
||||
actions.push(new mapActions.GetLayerValue(ol,a.x,a.y));
|
||||
}
|
||||
});
|
||||
}
|
||||
return actions;
|
||||
})));
|
||||
|
||||
|
||||
setState$ = createEffect(() => this.actions$.pipe(
|
||||
setState$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(mapActions.SETSTATE),
|
||||
withLatestFrom(this.store$.select(mapReducers.selectGetInSearch)),
|
||||
switchMap(([action, inSearch]) => {
|
||||
const a = action as mapActions.SetState;
|
||||
return this.getActionFromQueryState(a.queryState, inSearch);
|
||||
switchMap(([action,inSearch]) => {
|
||||
let a = action as mapActions.SetState;
|
||||
return this.getActionFromQueryState(a.queryState,inSearch);
|
||||
})));
|
||||
|
||||
escape$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(commonActions.ESCAPE),
|
||||
switchMap((action) => {
|
||||
const a = action as commonActions.Escape;
|
||||
if (a.escapeKey) {
|
||||
return of(new mapActions.Clear());
|
||||
} else {
|
||||
return EMPTY;
|
||||
}
|
||||
})));
|
||||
escape$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(commonActions.ESCAPE),
|
||||
switchMap((action) => {
|
||||
let a = action as commonActions.Escape;
|
||||
if(a.escapeKey) {
|
||||
return of(new mapActions.Clear());
|
||||
} else {
|
||||
return EMPTY;
|
||||
}
|
||||
})));
|
||||
|
||||
setOverride$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(ROUTER_NAVIGATED),
|
||||
switchMap(() => this.store$.select(selectRouteData as any)),
|
||||
switchMap((data: any) => {
|
||||
if (data && data["fm-map-map"]) {
|
||||
const params = data["fm-map-map"];
|
||||
this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false;
|
||||
} else {
|
||||
this.overrideSelectedItemLayer = false;
|
||||
}
|
||||
return [];
|
||||
})
|
||||
));
|
||||
setOverride$ = createEffect(() => this.actions$.pipe(
|
||||
ofType(ROUTER_NAVIGATED),
|
||||
switchMap(() => this.store$.select(selectRouteData as any)),
|
||||
switchMap((data: any) => {
|
||||
if(data && data["fm-map-map"]) {
|
||||
let params = data["fm-map-map"];
|
||||
this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false;
|
||||
} else {
|
||||
this.overrideSelectedItemLayer = false;
|
||||
}
|
||||
return [];
|
||||
})
|
||||
));
|
||||
|
||||
constructor(private actions$: Actions, private store$: Store<mapReducers.State>, private folderService$: FolderService, private itemService$: ItemService, private featureIconService$: FeatureIconService, private itemTypeService$: ItemTypeService) {
|
||||
constructor(private actions$: Actions, private store$: Store<mapReducers.State>, private folderService$: FolderService, private itemService$: ItemService,private featureIconService$:FeatureIconService,private itemTypeService$:ItemTypeService) {
|
||||
this._geojsonFormat = new GeoJSON();
|
||||
this._wktFormat = new WKT();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,13 +15,13 @@ export interface IItemLayer {
|
||||
export class ItemLayer implements IItemLayer {
|
||||
public item: IItem;
|
||||
public layer: Layer<Source> = null;
|
||||
public visible = true;
|
||||
public legendVisible = false;
|
||||
public visible: boolean = true;
|
||||
public legendVisible: boolean = false;
|
||||
public projection: string;
|
||||
public opacity = 1;
|
||||
public layerIndex = -1;
|
||||
public opacity: number = 1;
|
||||
public layerIndex: number = -1;
|
||||
|
||||
constructor(item:IItem,opacity = 1, visible = true,layerIndex=-1) {
|
||||
constructor(item:IItem,opacity:number = 1, visible:boolean = true,layerIndex:number=-1) {
|
||||
this.item = item;
|
||||
this.opacity = opacity;
|
||||
this.visible = visible;
|
||||
@ -42,7 +42,7 @@ export class TemporalItemLayer extends ItemLayer implements ITemporalItemLayer {
|
||||
public nextItemLayer:IItemLayer = null;
|
||||
public temporalItems:IItem[] = [];
|
||||
|
||||
constructor(item:IItem,opacity = 1, visible = true) {
|
||||
constructor(item:IItem,opacity:number = 1, visible:boolean = true) {
|
||||
super(item,opacity,visible)
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
export interface ILayervalue {
|
||||
date: string;
|
||||
layerName: string;
|
||||
unit: string;
|
||||
quantity: string;
|
||||
value: number;
|
||||
scale: number;
|
||||
date:string;
|
||||
layerName:string;
|
||||
unit:string;
|
||||
quantity:string;
|
||||
value:number;
|
||||
}
|
||||
@ -4,4 +4,4 @@ import {Geometry } from 'ol/geom';
|
||||
|
||||
export interface IStyles{
|
||||
[id: string]: Style | ((featue:Feature<Geometry>) => Style);
|
||||
}
|
||||
};
|
||||
@ -49,7 +49,6 @@ export interface State {
|
||||
features: Array<Feature<Geometry>>,
|
||||
panelVisible: boolean,
|
||||
panelCollapsed: boolean,
|
||||
panelExtraWide: boolean,
|
||||
selectedFeature: Feature<Geometry>,
|
||||
selectedItem:IItem,
|
||||
parentItem:IItem,
|
||||
@ -95,7 +94,6 @@ export const initialState: State = {
|
||||
features: [],
|
||||
panelVisible: false,
|
||||
panelCollapsed: false,
|
||||
panelExtraWide: false,
|
||||
selectedFeature: null,
|
||||
selectedItem: null,
|
||||
parentItem: null,
|
||||
@ -125,56 +123,56 @@ export const initialState: State = {
|
||||
export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {
|
||||
switch (action.type) {
|
||||
case ROUTER_NAVIGATION: {
|
||||
const a = action as RouterNavigationAction;
|
||||
let a = action as RouterNavigationAction;
|
||||
return tassign(state);
|
||||
}
|
||||
case mapActions.SETMAPSTATE: {
|
||||
const a = action as mapActions.SetMapState;
|
||||
let a = action as mapActions.SetMapState;
|
||||
return tassign(state, {
|
||||
mapState: a.mapState
|
||||
});
|
||||
}
|
||||
case mapActions.SETQUERYSTATE: {
|
||||
const a = action as mapActions.SetQueryState;
|
||||
let a = action as mapActions.SetQueryState;
|
||||
return tassign(state, { queryState: tassign(a.queryState ),replaceUrl:a.replaceUrl});
|
||||
}
|
||||
case mapActions.SETSTATE: {
|
||||
const a = action as mapActions.SetState;
|
||||
let a = action as mapActions.SetState;
|
||||
return tassign(state, { mapState: tassign(a.mapState), queryState: tassign(a.queryState)});
|
||||
}
|
||||
case mapActions.SETVIEWEXTENT: {
|
||||
const a = action as mapActions.SetViewExtent;
|
||||
let a = action as mapActions.SetViewExtent;
|
||||
return tassign(state, { viewExtent: a.extent });
|
||||
}
|
||||
case mapActions.SETPARENT: {
|
||||
const a = action as mapActions.SetParent;
|
||||
let a = action as mapActions.SetParent;
|
||||
return tassign(state, {
|
||||
parentCode : a.parentCode
|
||||
});
|
||||
}
|
||||
case mapActions.STARTSEARCHSUCCESS: {
|
||||
const a = action as mapActions.StartSearchSuccess;
|
||||
let a = action as mapActions.StartSearchSuccess;
|
||||
return tassign(state, {
|
||||
features: a.features,
|
||||
inSearch:false
|
||||
});
|
||||
}
|
||||
case mapActions.SETFEATURES: {
|
||||
const a = action as mapActions.SetFeatures;
|
||||
let a = action as mapActions.SetFeatures;
|
||||
return tassign(state, {
|
||||
features: a.features
|
||||
});
|
||||
}
|
||||
case mapActions.SELECTFEATURE: {
|
||||
const a = action as mapActions.SelectFeature;
|
||||
let a = action as mapActions.SelectFeature;
|
||||
return tassign(state, {
|
||||
selectedFeature: state.selectedItem?state.selectedFeature: a.feature
|
||||
});
|
||||
}
|
||||
case mapActions.SELECTITEM: {
|
||||
const a = action as mapActions.SelectItem;
|
||||
const itemCode = state.selectedItem ? state.selectedItem.code : "";
|
||||
const inSearch = a.itemCode != itemCode;
|
||||
let a = action as mapActions.SelectItem;
|
||||
let itemCode = state.selectedItem ? state.selectedItem.code : "";
|
||||
let inSearch = a.itemCode != itemCode;
|
||||
return tassign(state, {
|
||||
selectedItem: null,
|
||||
selectedItemLayer: null,
|
||||
@ -184,7 +182,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
});
|
||||
}
|
||||
case mapActions.SELECTITEMSUCCESS: {
|
||||
const a = action as mapActions.SelectItemSuccess;
|
||||
let a = action as mapActions.SelectItemSuccess;
|
||||
return tassign(state, {
|
||||
inSearch:false,
|
||||
selectedItem: a.item,
|
||||
@ -197,8 +195,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
});
|
||||
}
|
||||
case mapActions.SETSELECTEDITEMLAYER: {
|
||||
const a = action as mapActions.SetSelectedItemLayer;
|
||||
let itemLayer = null;
|
||||
let a = action as mapActions.SetSelectedItemLayer;
|
||||
var itemLayer = null;
|
||||
if (a.item && "vnd.farmmaps.itemtype.layer,vnd.farmmaps.itemtype.shape.processed,vnd.farmmaps.itemtype.geotiff.processed".indexOf(a.item.itemType) >=0 ) {
|
||||
itemLayer = new ItemLayer(a.item);
|
||||
itemLayer.layerIndex = a.layerIndex>=0?a.layerIndex:a.item.data.layers?a.item.data.layers[0].index:-1;
|
||||
@ -211,12 +209,12 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
});
|
||||
}
|
||||
case mapActions.SELECTTEMPORALITEMSSUCCESS:{
|
||||
const a = action as mapActions.SelectTemporalItemsSuccess;
|
||||
const selectedItemLayer=tassign(state.selectedItemLayer) as TemporalItemLayer;
|
||||
let a = action as mapActions.SelectTemporalItemsSuccess;
|
||||
let selectedItemLayer=tassign(state.selectedItemLayer) as TemporalItemLayer;
|
||||
let layerIndex=-1;
|
||||
selectedItemLayer.temporalItems = a.temporalItems;
|
||||
if(a.temporalItems.length>0) {
|
||||
const item = a.temporalItems[a.temporalItems.length-1];
|
||||
let item = a.temporalItems[a.temporalItems.length-1];
|
||||
layerIndex = item.data.layers[0].index;
|
||||
selectedItemLayer.selectedItemLayer = new ItemLayer(item,1,true,layerIndex);
|
||||
} else {
|
||||
@ -225,16 +223,16 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
selectedItemLayer.previousItemLayer = a.temporalItems.length>1?new ItemLayer(a.temporalItems[a.temporalItems.length-2],0,true,layerIndex):null;
|
||||
selectedItemLayer.nextItemLayer = null;
|
||||
if(selectedItemLayer.selectedItemLayer) {
|
||||
const layerIndex = selectedItemLayer.selectedItemLayer.item.data.layers[0].index;
|
||||
let layerIndex = selectedItemLayer.selectedItemLayer.item.data.layers[0].index;
|
||||
selectedItemLayer.layerIndex = layerIndex;
|
||||
}
|
||||
|
||||
return tassign(state,{selectedItemLayer:tassign(state.selectedItemLayer,selectedItemLayer as ItemLayer)});
|
||||
}
|
||||
case mapActions.NEXTTEMPORAL: {
|
||||
const temporalLayer = state.selectedItemLayer as ITemporalItemLayer;
|
||||
let temporalLayer = state.selectedItemLayer as ITemporalItemLayer;
|
||||
if(temporalLayer.temporalItems && temporalLayer.temporalItems.length>0) {
|
||||
const index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item);
|
||||
let index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item);
|
||||
if(index == (temporalLayer.temporalItems.length-1)) {
|
||||
return state;
|
||||
} else {
|
||||
@ -260,9 +258,9 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
}
|
||||
}
|
||||
case mapActions.PREVIOUSTEMPORAL: {
|
||||
const temporalLayer = state.selectedItemLayer as ITemporalItemLayer;
|
||||
let temporalLayer = state.selectedItemLayer as ITemporalItemLayer;
|
||||
if(temporalLayer.temporalItems && temporalLayer.temporalItems.length>0) {
|
||||
const index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item);
|
||||
let index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item);
|
||||
if(index == 0) {
|
||||
return state;
|
||||
} else {
|
||||
@ -291,8 +289,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
//todo implement
|
||||
}
|
||||
case mapActions.STARTSEARCH: {
|
||||
const a = action as mapActions.StartSearch;
|
||||
const panelVisible = a.queryState.itemCode!=null ||a.queryState.itemType!=null||a.queryState.parentCode!=null || a.queryState.query != null || a.queryState.tags != null;
|
||||
let a = action as mapActions.StartSearch;
|
||||
let panelVisible = a.queryState.itemCode!=null ||a.queryState.itemType!=null||a.queryState.parentCode!=null || a.queryState.query != null || a.queryState.tags != null;
|
||||
return tassign(state, {
|
||||
selectedItem: null,
|
||||
features:[],
|
||||
@ -308,7 +306,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
return tassign(state,{inSearch:false});
|
||||
}
|
||||
case mapActions.DOQUERY: {
|
||||
const a = action as mapActions.DoQuery;
|
||||
let a = action as mapActions.DoQuery;
|
||||
return tassign(state, {
|
||||
query: tassign(state.query,
|
||||
{
|
||||
@ -323,8 +321,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
}
|
||||
|
||||
case mapActions.ADDFEATURESUCCESS: {
|
||||
const a = action as mapActions.AddFeatureSuccess;
|
||||
const features = state.features.slice();
|
||||
let a = action as mapActions.AddFeatureSuccess;
|
||||
let features = state.features.slice();
|
||||
features.push(a.feature);
|
||||
return tassign(state, {
|
||||
panelVisible: true,
|
||||
@ -336,8 +334,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
});
|
||||
}
|
||||
case mapActions.UPDATEFEATURESUCCESS: {
|
||||
const a = action as mapActions.UpdateFeatureSuccess;
|
||||
const features: any[] = [];
|
||||
let a = action as mapActions.UpdateFeatureSuccess;
|
||||
let features: any[] = [];
|
||||
var index = -1;
|
||||
for (var i = 0; i < state.features.length; i++) {
|
||||
if (state.features[i].getId() == a.feature.getId()) {
|
||||
@ -358,15 +356,15 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
return tassign(state, { searchCollapsed: state.panelVisible ? false: true,showLayerSwitcher:false});
|
||||
}
|
||||
case mapActions.SETEXTENT: {
|
||||
const a = action as mapActions.SetExtent;
|
||||
let a = action as mapActions.SetExtent;
|
||||
return tassign(state, { extent: a.extent });
|
||||
}
|
||||
case mapActions.ADDLAYER: {
|
||||
const a = action as mapActions.AddLayer;
|
||||
const itemLayers = state.overlayLayers.slice(0);
|
||||
const itemLayer = new ItemLayer(a.item);
|
||||
let a = action as mapActions.AddLayer;
|
||||
let itemLayers = state.overlayLayers.slice(0);
|
||||
let itemLayer = new ItemLayer(a.item);
|
||||
itemLayer.layerIndex = a.layerIndex == -1 ? 0 : a.layerIndex;
|
||||
const existing = itemLayers.filter(il => il.item.code == itemLayer.item.code && il.layerIndex == itemLayer.layerIndex);
|
||||
let existing = itemLayers.filter(il => il.item.code == itemLayer.item.code && il.layerIndex == itemLayer.layerIndex);
|
||||
if(existing.length==0) {
|
||||
itemLayers.push(itemLayer);
|
||||
return tassign(state, { overlayLayers: itemLayers, selectedOverlayLayer: itemLayer });
|
||||
@ -376,10 +374,10 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
|
||||
}
|
||||
case mapActions.REMOVELAYER: {
|
||||
const a = action as mapActions.RemoveLayer;
|
||||
const newLayers = state.overlayLayers.slice(0);
|
||||
const i = state.overlayLayers.indexOf(a.itemLayer);
|
||||
let selectedOverlayLayer: IItemLayer = null;
|
||||
let a = action as mapActions.RemoveLayer;
|
||||
let newLayers = state.overlayLayers.slice(0);
|
||||
let i = state.overlayLayers.indexOf(a.itemLayer);
|
||||
var selectedOverlayLayer: IItemLayer = null;
|
||||
if (i>0 && state.overlayLayers.length > 1)
|
||||
selectedOverlayLayer = state.overlayLayers[i - 1];
|
||||
else if (i == 0 && state.overlayLayers.length > 1)
|
||||
@ -390,53 +388,50 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
case mapActions.CLEARLAYERS: {
|
||||
return tassign(state, {overlayLayers: [], selectedOverlayLayer: null});
|
||||
}
|
||||
case mapActions.CLEARFEATURES: {
|
||||
return tassign(state, {features: [], selectedFeature: null});
|
||||
}
|
||||
case mapActions.SETVISIBILITY: {
|
||||
const a = action as mapActions.SetVisibility;
|
||||
let a = action as mapActions.SetVisibility;
|
||||
if(state.selectedItemLayer == a.itemLayer) {
|
||||
return tassign(state,{selectedItemLayer: tassign(state.selectedItemLayer,{visible:a.visibility})});
|
||||
} else {
|
||||
const newLayers = state.overlayLayers.slice(0);
|
||||
const i = state.overlayLayers.indexOf(a.itemLayer);
|
||||
let newLayers = state.overlayLayers.slice(0);
|
||||
let i = state.overlayLayers.indexOf(a.itemLayer);
|
||||
newLayers[i].visible = a.visibility;
|
||||
return tassign(state, { overlayLayers: newLayers });
|
||||
}
|
||||
}
|
||||
case mapActions.SETOPACITY: {
|
||||
const a = action as mapActions.SetOpacity;
|
||||
let a = action as mapActions.SetOpacity;
|
||||
if(state.selectedItemLayer == a.itemLayer) {
|
||||
return tassign(state,{selectedItemLayer: tassign(state.selectedItemLayer,{opacity:a.opacity})});
|
||||
} else {
|
||||
const newLayers = state.overlayLayers.slice(0);
|
||||
const i = state.overlayLayers.indexOf(a.itemLayer);
|
||||
let newLayers = state.overlayLayers.slice(0);
|
||||
let i = state.overlayLayers.indexOf(a.itemLayer);
|
||||
newLayers[i].opacity = a.opacity;
|
||||
return tassign(state, { overlayLayers: newLayers });
|
||||
}
|
||||
}
|
||||
case mapActions.SETLAYERINDEX: {
|
||||
const a = action as mapActions.SetLayerIndex;
|
||||
let a = action as mapActions.SetLayerIndex;
|
||||
if (a.itemLayer == null) {
|
||||
if(state.selectedItemLayer.item.itemType == "vnd.farmmaps.itemtype.temporal") {
|
||||
var newItemlayer = tassign(state.selectedItemLayer,{layerIndex:a.layerIndex});
|
||||
const tl = newItemlayer as ITemporalItemLayer;
|
||||
let tl = newItemlayer as ITemporalItemLayer;
|
||||
if(tl.previousItemLayer) {
|
||||
const nl = new ItemLayer(tl.previousItemLayer.item);
|
||||
let nl = new ItemLayer(tl.previousItemLayer.item);
|
||||
nl.opacity = tl.previousItemLayer.opacity;
|
||||
nl.visible = tl.previousItemLayer.visible;
|
||||
nl.layerIndex = a.layerIndex;
|
||||
tl.previousItemLayer = nl;
|
||||
}
|
||||
if(tl.selectedItemLayer) {
|
||||
const nl = new ItemLayer(tl.selectedItemLayer.item);
|
||||
let nl = new ItemLayer(tl.selectedItemLayer.item);
|
||||
nl.opacity = tl.selectedItemLayer.opacity;
|
||||
nl.visible = tl.selectedItemLayer.visible;
|
||||
nl.layerIndex = a.layerIndex;
|
||||
tl.selectedItemLayer = nl;
|
||||
}
|
||||
if(tl.nextItemLayer) {
|
||||
const nl = new ItemLayer(tl.nextItemLayer.item);
|
||||
let nl = new ItemLayer(tl.nextItemLayer.item);
|
||||
nl.opacity = tl.nextItemLayer.opacity;
|
||||
nl.visible = tl.nextItemLayer.visible;
|
||||
nl.layerIndex = a.layerIndex;
|
||||
@ -449,24 +444,24 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
}
|
||||
return tassign(state, { selectedItemLayer: newItemlayer})
|
||||
} else {
|
||||
const newLayers = state.overlayLayers.slice(0);
|
||||
const i = state.overlayLayers.indexOf(a.itemLayer);
|
||||
let newLayers = state.overlayLayers.slice(0);
|
||||
let i = state.overlayLayers.indexOf(a.itemLayer);
|
||||
newLayers[i].layerIndex = a.layerIndex;
|
||||
return tassign(state, { overlayLayers: newLayers });
|
||||
}
|
||||
}
|
||||
case mapActions.LOADBASELAYERSSUCCESS: {
|
||||
const a =action as mapActions.LoadBaseLayersSuccess;
|
||||
const baseLayers:ItemLayer[] = [];
|
||||
for (const item of a.items) {
|
||||
const l = new ItemLayer(item);
|
||||
let a =action as mapActions.LoadBaseLayersSuccess;
|
||||
let baseLayers:ItemLayer[] = [];
|
||||
for (let item of a.items) {
|
||||
var l = new ItemLayer(item);
|
||||
l.visible = false;
|
||||
baseLayers.push(l);
|
||||
}
|
||||
let selectedBaseLayer: IItemLayer = null;
|
||||
var selectedBaseLayer: IItemLayer = null;
|
||||
var mapState = tassign(state.mapState);
|
||||
const sb = baseLayers.filter(layer => layer.item.code === mapState.baseLayerCode);
|
||||
const db = baseLayers.filter(layer => layer.item.data && layer.item.data.default === true);
|
||||
let sb = baseLayers.filter(layer => layer.item.code === mapState.baseLayerCode);
|
||||
let db = baseLayers.filter(layer => layer.item.data && layer.item.data.default === true);
|
||||
if (baseLayers.length > 0 && mapState.baseLayerCode != "" && sb.length>0) {
|
||||
selectedBaseLayer = sb[0];
|
||||
selectedBaseLayer.visible = true;
|
||||
@ -481,22 +476,22 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
return tassign(state, { mapState:mapState, baseLayers: baseLayers, selectedBaseLayer: selectedBaseLayer });
|
||||
}
|
||||
case mapActions.SELECTBASELAYER: {
|
||||
const a = action as mapActions.SelectBaseLayer;
|
||||
const baseLayers = state.baseLayers.slice(0);
|
||||
let a = action as mapActions.SelectBaseLayer;
|
||||
let baseLayers = state.baseLayers.slice(0);
|
||||
baseLayers.forEach((l) => l.visible = false);
|
||||
const i = state.baseLayers.indexOf(a.itemLayer);
|
||||
let i = state.baseLayers.indexOf(a.itemLayer);
|
||||
baseLayers[i].visible = true;
|
||||
var mapState = tassign(state.mapState);
|
||||
mapState.baseLayerCode = a.itemLayer.item.code;
|
||||
return tassign(state, {mapState:mapState, baseLayers:baseLayers,selectedBaseLayer:a.itemLayer });
|
||||
}
|
||||
case mapActions.SELECTOVERLAYLAYER: {
|
||||
const a = action as mapActions.SelectOverlayLayer;
|
||||
let a = action as mapActions.SelectOverlayLayer;
|
||||
return tassign(state, { selectedOverlayLayer: a.itemLayer });
|
||||
}
|
||||
|
||||
case mapActions.CLEAR: {
|
||||
const newQueryState = tassign(state.queryState, { query: null, tags: null, itemCode: null, parentCode: null, itemType: null });
|
||||
let newQueryState = tassign(state.queryState, { query: null, tags: null, itemCode: null, parentCode: null, itemType: null });
|
||||
return tassign(state, {
|
||||
panelVisible: false,
|
||||
panelCollapsed:false,
|
||||
@ -516,41 +511,41 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
});
|
||||
}
|
||||
case mapActions.SETSTYLE:{
|
||||
const a = action as mapActions.SetStyle;
|
||||
const styles = tassign(state.styles);
|
||||
let a = action as mapActions.SetStyle;
|
||||
let styles = tassign(state.styles);
|
||||
styles[a.itemType] = a.style;
|
||||
return tassign(state,{styles:styles});
|
||||
}
|
||||
case mapActions.SHOWLAYERSWITCHER:{
|
||||
const a = action as mapActions.ShowLayerSwitcher;
|
||||
let a = action as mapActions.ShowLayerSwitcher;
|
||||
return tassign(state,{showLayerSwitcher:a.show});
|
||||
}
|
||||
case mapActions.TOGGLESHOWDATALAYERSLIDE:{
|
||||
return tassign(state,{showDataLayerSlide:!state.showDataLayerSlide});
|
||||
}
|
||||
case mapActions.SETREPLACEURL: {
|
||||
const a= action as mapActions.SetReplaceUrl;
|
||||
let a= action as mapActions.SetReplaceUrl;
|
||||
return tassign(state,{replaceUrl:a.replaceUrl});
|
||||
}
|
||||
case mapActions.TOGGLELAYERVALUESENABLED: {
|
||||
return tassign(state,{layerValuesEnabled:!state.layerValuesEnabled});
|
||||
}
|
||||
case mapActions.SETLAYERVALUESLOCATION: {
|
||||
const a= action as mapActions.SetLayerValuesLocation;
|
||||
let a= action as mapActions.SetLayerValuesLocation;
|
||||
return tassign(state,{layerValuesX: a.x, layerValuesY:a.y,layerValues:[]});
|
||||
}
|
||||
case mapActions.GETLAYERVALUESUCCESS:{
|
||||
const a= action as mapActions.GetLayerValueSuccess;
|
||||
const v = state.layerValues.slice(0);
|
||||
let a= action as mapActions.GetLayerValueSuccess;
|
||||
let v = state.layerValues.slice(0);
|
||||
v.push(a.layervalue);
|
||||
return tassign(state,{layerValues:v});
|
||||
}
|
||||
case mapActions.SETVIEWSTATE:{
|
||||
const a= action as mapActions.SetViewState;
|
||||
let a= action as mapActions.SetViewState;
|
||||
return tassign(state,{viewEnabled:a.enabled});
|
||||
}
|
||||
case commonActions.ITEMDELETEDEVENT:{
|
||||
const a= action as commonActions.ItemDeletedEvent;
|
||||
let a= action as commonActions.ItemDeletedEvent;
|
||||
if(state.selectedItem && state.selectedItem.code == a.itemCode) {
|
||||
return tassign(state,{
|
||||
selectedItem: null,
|
||||
@ -567,17 +562,13 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
||||
}
|
||||
}
|
||||
if(index>=0) {
|
||||
const newFeatures = state.features.slice(0);
|
||||
let newFeatures = state.features.slice(0);
|
||||
newFeatures.splice(index,1);
|
||||
return tassign(state,{features:newFeatures});
|
||||
}
|
||||
}
|
||||
return state;
|
||||
}
|
||||
case mapActions.SETPANELEXTRAWIDE:{
|
||||
const a= action as mapActions.SetPanelExtraWide;
|
||||
return tassign(state,{panelExtraWide:a.panelExtraWide});
|
||||
}
|
||||
default: {
|
||||
return state;
|
||||
}
|
||||
@ -589,7 +580,6 @@ export const getParentCode = (state: State) => state.parentCode;
|
||||
export const getFeatures = (state: State) => state.features;
|
||||
export const getPanelVisible = (state: State) => state.panelVisible;
|
||||
export const getPanelCollapsed = (state: State) => state.panelCollapsed;
|
||||
export const getPanelExtraWide = (state: State) => state.panelExtraWide;
|
||||
export const getSelectedFeature = (state: State) => state.selectedFeature;
|
||||
export const getSelectedItem = (state: State) => state.selectedItem;
|
||||
export const getParentItem = (state: State) => state.parentItem;
|
||||
@ -598,7 +588,6 @@ export const getClearEnabled = (state: State) => state.clearEnabled;
|
||||
export const getSearchCollapsed = (state: State) => state.searchCollapsed;
|
||||
export const getSearchMinified = (state: State) => state.searchMinified;
|
||||
export const getExtent = (state: State) => state.extent;
|
||||
export const getViewExtent = (state: State) => state.viewExtent;
|
||||
export const getOverlayLayers = (state: State) => state.overlayLayers;
|
||||
export const getBaseLayers = (state: State) => state.baseLayers;
|
||||
export const getProjection = (state: State) => state.projection;
|
||||
@ -625,7 +614,6 @@ export const selectGetParentCode = createSelector(selectMapState, getParentCode)
|
||||
export const selectGetFeatures = createSelector(selectMapState, getFeatures);
|
||||
export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisible);
|
||||
export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed);
|
||||
export const selectGetPanelExtraWide = createSelector(selectMapState, getPanelExtraWide);
|
||||
export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature);
|
||||
export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem);
|
||||
export const selectGetParentItem = createSelector(selectMapState, getParentItem);
|
||||
@ -634,7 +622,6 @@ export const selectGetClearEnabled = createSelector(selectMapState, getClearEnab
|
||||
export const selectGetSearchCollapsed = createSelector(selectMapState, getSearchCollapsed);
|
||||
export const selectGetSearchMinified = createSelector(selectMapState, getSearchMinified);
|
||||
export const selectGetExtent = createSelector(selectMapState, getExtent);
|
||||
export const selectGetViewExtent = createSelector(selectMapState, getViewExtent);
|
||||
export const selectGetOverlayLayers = createSelector(selectMapState, getOverlayLayers);
|
||||
export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers);
|
||||
export const selectGetProjection = createSelector(selectMapState, getProjection);
|
||||
|
||||
@ -8,25 +8,25 @@ export class DeviceOrientationService {
|
||||
compassHeading(alpha, beta, gamma):number {
|
||||
|
||||
// Convert degrees to radians
|
||||
const alphaRad = alpha * (Math.PI / 180);
|
||||
const betaRad = beta * (Math.PI / 180);
|
||||
const gammaRad = gamma * (Math.PI / 180);
|
||||
var alphaRad = alpha * (Math.PI / 180);
|
||||
var betaRad = beta * (Math.PI / 180);
|
||||
var gammaRad = gamma * (Math.PI / 180);
|
||||
|
||||
// Calculate equation components
|
||||
const cA = Math.cos(alphaRad);
|
||||
const sA = Math.sin(alphaRad);
|
||||
const cB = Math.cos(betaRad);
|
||||
const sB = Math.sin(betaRad);
|
||||
const cG = Math.cos(gammaRad);
|
||||
const sG = Math.sin(gammaRad);
|
||||
var cA = Math.cos(alphaRad);
|
||||
var sA = Math.sin(alphaRad);
|
||||
var cB = Math.cos(betaRad);
|
||||
var sB = Math.sin(betaRad);
|
||||
var cG = Math.cos(gammaRad);
|
||||
var sG = Math.sin(gammaRad);
|
||||
|
||||
// Calculate A, B, C rotation components
|
||||
const rA = - cA * sG - sA * sB * cG;
|
||||
const rB = - sA * sG + cA * sB * cG;
|
||||
const rC = - cB * cG;
|
||||
var rA = - cA * sG - sA * sB * cG;
|
||||
var rB = - sA * sG + cA * sB * cG;
|
||||
var rC = - cB * cG;
|
||||
|
||||
// Calculate compass heading
|
||||
let compassHeading = Math.atan(rA / rB);
|
||||
var compassHeading = Math.atan(rA / rB);
|
||||
|
||||
// Convert from half unit circle to whole unit circle
|
||||
if(rB < 0) {
|
||||
@ -40,7 +40,7 @@ export class DeviceOrientationService {
|
||||
getCurrentCompassHeading(): Observable<number> {
|
||||
return Observable.create((observer: Observer<number>) => {
|
||||
window.addEventListener("deviceorientation", (event:DeviceOrientationEvent)=>{
|
||||
const heading = this.compassHeading(event.alpha,event.beta,event.gamma);
|
||||
let heading = this.compassHeading(event.alpha,event.beta,event.gamma);
|
||||
if(!Number.isNaN(heading)) {
|
||||
observer.next(heading);
|
||||
}
|
||||
|
||||
@ -7,31 +7,31 @@ import * as extent from 'ol/extent';
|
||||
@Injectable()
|
||||
export class FeatureIconService {
|
||||
|
||||
getIconImageDataUrl(iconClass:string, backgroundColor = "#c80a6e",color = "#ffffff"): string {
|
||||
const canvas = document.createElement('canvas');
|
||||
getIconImageDataUrl(iconClass:string, backgroundColor: string = "#c80a6e",color:string = "#ffffff"): string {
|
||||
var canvas = document.createElement('canvas');
|
||||
canvas.width = 365;
|
||||
canvas.height = 560;
|
||||
const ctx = canvas.getContext('2d');
|
||||
var ctx = canvas.getContext('2d');
|
||||
ctx.lineWidth = 6;
|
||||
ctx.fillStyle = backgroundColor;
|
||||
ctx.strokeStyle = "#000000";
|
||||
const path = new Path2D("m182.9 551.7c0 0.1 0.2 0.3 0.2 0.3s175.2-269 175.2-357.4c0-130.1-88.8-186.7-175.4-186.9-86.6 0.2-175.4 56.8-175.4 186.9 0 88.4 175.3 357.4 175.3 357.4z");
|
||||
var path = new Path2D("m182.9 551.7c0 0.1 0.2 0.3 0.2 0.3s175.2-269 175.2-357.4c0-130.1-88.8-186.7-175.4-186.9-86.6 0.2-175.4 56.8-175.4 186.9 0 88.4 175.3 357.4 175.3 357.4z");
|
||||
ctx.fill(path)
|
||||
|
||||
let iconCharacter = "";
|
||||
var iconCharacter = "";
|
||||
if (iconClass != null) {
|
||||
const element = document.createElement("i");
|
||||
var element = document.createElement("i");
|
||||
element.style.display = "none";
|
||||
element.className = iconClass;
|
||||
document.body.appendChild(element);
|
||||
iconCharacter = getComputedStyle(element, "::before").content.replace(/"/g, '');
|
||||
const iconFont = "200px " +getComputedStyle(element, "::before").fontFamily
|
||||
let iconFont = "200px " +getComputedStyle(element, "::before").fontFamily
|
||||
document.body.removeChild(element);
|
||||
ctx.strokeStyle = color;
|
||||
ctx.fillStyle = color;
|
||||
ctx.lineWidth = 15;
|
||||
ctx.font = iconFont;
|
||||
const ts = ctx.measureText(iconCharacter);
|
||||
var ts = ctx.measureText(iconCharacter);
|
||||
ctx.fillText(iconCharacter, 182.9 - (ts.width / 2), 250);
|
||||
ctx.strokeText(iconCharacter, 182.9 - (ts.width / 2), 250);
|
||||
}
|
||||
|
||||
@ -9,19 +9,19 @@ export class TemporalService {
|
||||
constructor(private timespanService$:TimespanService,private datePipe$: DatePipe) {}
|
||||
|
||||
hasNext(itemLayer:IItemLayer):boolean {
|
||||
const temporalItemLayer = itemLayer as ITemporalItemLayer;
|
||||
let temporalItemLayer = itemLayer as ITemporalItemLayer;
|
||||
return temporalItemLayer && temporalItemLayer.nextItemLayer != null;
|
||||
}
|
||||
|
||||
selectedDate(itemLayer:IItemLayer):string {
|
||||
const temporalItemLayer = itemLayer as ITemporalItemLayer;
|
||||
let temporalItemLayer = itemLayer as ITemporalItemLayer;
|
||||
if(temporalItemLayer && temporalItemLayer.selectedItemLayer) {
|
||||
if(temporalItemLayer && temporalItemLayer.selectedItemLayer.item.dataDate && temporalItemLayer.selectedItemLayer.item.dataEndDate) {
|
||||
const sd = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate));
|
||||
const ed = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataEndDate));
|
||||
let sd = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate));
|
||||
let ed = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataEndDate));
|
||||
return this.timespanService$.getCaption(sd,ed);
|
||||
} else {
|
||||
const d = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate));
|
||||
let d = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate));
|
||||
return this.datePipe$.transform(d, "shortDate");
|
||||
}
|
||||
}
|
||||
@ -29,14 +29,14 @@ export class TemporalService {
|
||||
}
|
||||
|
||||
nextDate(itemLayer:IItemLayer):string {
|
||||
const temporalItemLayer = itemLayer as ITemporalItemLayer;
|
||||
let temporalItemLayer = itemLayer as ITemporalItemLayer;
|
||||
if(temporalItemLayer && temporalItemLayer.nextItemLayer && temporalItemLayer.nextItemLayer.item) {
|
||||
if(temporalItemLayer.nextItemLayer.item.dataDate && temporalItemLayer.nextItemLayer.item.dataEndDate) {
|
||||
const sd = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate));
|
||||
const ed = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataEndDate));
|
||||
let sd = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate));
|
||||
let ed = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataEndDate));
|
||||
return this.timespanService$.getCaption(sd,ed);
|
||||
} else {
|
||||
const d = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate));
|
||||
let d = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate));
|
||||
return this.datePipe$.transform(d, "shortDate");
|
||||
}
|
||||
}
|
||||
@ -44,19 +44,19 @@ export class TemporalService {
|
||||
}
|
||||
|
||||
hasPrevious(itemLayer:IItemLayer):boolean {
|
||||
const temporalItemLayer = itemLayer as ITemporalItemLayer;
|
||||
let temporalItemLayer = itemLayer as ITemporalItemLayer;
|
||||
return temporalItemLayer && temporalItemLayer.previousItemLayer != null;
|
||||
}
|
||||
|
||||
previousDate(itemLayer:IItemLayer):string {
|
||||
const temporalItemLayer = itemLayer as ITemporalItemLayer;
|
||||
let temporalItemLayer = itemLayer as ITemporalItemLayer;
|
||||
if(temporalItemLayer && temporalItemLayer.previousItemLayer && temporalItemLayer.previousItemLayer.item) {
|
||||
if(temporalItemLayer.previousItemLayer.item.dataDate && temporalItemLayer.previousItemLayer.item.dataEndDate) {
|
||||
const sd = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate));
|
||||
const ed = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataEndDate));
|
||||
let sd = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate));
|
||||
let ed = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataEndDate));
|
||||
return this.timespanService$.getCaption(sd,ed);
|
||||
} else {
|
||||
const d = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate));
|
||||
let d = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate));
|
||||
return this.datePipe$.transform(d, "shortDate");
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,6 +9,8 @@ import {
|
||||
platformBrowserDynamicTesting
|
||||
} from '@angular/platform-browser-dynamic/testing';
|
||||
|
||||
declare const require: any;
|
||||
|
||||
// First, initialize the Angular testing environment.
|
||||
getTestBed().initTestEnvironment(
|
||||
BrowserDynamicTestingModule,
|
||||
@ -16,3 +18,7 @@ getTestBed().initTestEnvironment(
|
||||
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",
|
||||
"compilerOptions": {
|
||||
"outDir": "../../out-tsc/lib",
|
||||
"target": "es2020",
|
||||
"module": "es2015",
|
||||
"moduleResolution": "node",
|
||||
"declaration": true,
|
||||
@ -10,27 +11,18 @@
|
||||
"emitDecoratorMetadata": true,
|
||||
"experimentalDecorators": true,
|
||||
"importHelpers": true,
|
||||
"esModuleInterop": true,
|
||||
"types": [],
|
||||
"lib": [
|
||||
"dom",
|
||||
"es2018"
|
||||
],
|
||||
"paths": {
|
||||
"@angular/*": [
|
||||
|
||||
"node_modules/@angular/*"
|
||||
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"angularCompilerOptions": {
|
||||
"skipTemplateCodegen": true,
|
||||
"strictMetadataEmit": true,
|
||||
"fullTemplateTypeCheck": true,
|
||||
"strictInjectionParameters": true,
|
||||
"enableResourceInlining": true,
|
||||
"compilationMode": "partial"
|
||||
"enableResourceInlining": true
|
||||
},
|
||||
"exclude": [
|
||||
"src/test.ts",
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
"extends": "../../tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "../../out-tsc/lib",
|
||||
"target": "es2020",
|
||||
"module": "es2015",
|
||||
"moduleResolution": "node",
|
||||
"declaration": true,
|
||||
|
||||
17
projects/common-map/tslint.json
Normal file
17
projects/common-map/tslint.json
Normal file
@ -0,0 +1,17 @@
|
||||
{
|
||||
"extends": "../../tslint.json",
|
||||
"rules": {
|
||||
"directive-selector": [
|
||||
true,
|
||||
"attribute",
|
||||
"fm-map",
|
||||
"camelCase"
|
||||
],
|
||||
"component-selector": [
|
||||
true,
|
||||
"element",
|
||||
"fm-map",
|
||||
"kebab-case"
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
module.exports = {
|
||||
"env": {
|
||||
"browser": true,
|
||||
"es2021": true
|
||||
},
|
||||
"extends": [
|
||||
"eslint:recommended",
|
||||
"plugin:@typescript-eslint/recommended"
|
||||
],
|
||||
"overrides": [
|
||||
],
|
||||
"parser": "@typescript-eslint/parser",
|
||||
"parserOptions": {
|
||||
"ecmaVersion": "latest",
|
||||
"sourceType": "module"
|
||||
},
|
||||
"plugins": [
|
||||
"@typescript-eslint"
|
||||
],
|
||||
"rules": {
|
||||
}
|
||||
}
|
||||
565
projects/common-map3d/package-lock.json
generated
565
projects/common-map3d/package-lock.json
generated
@ -1,565 +0,0 @@
|
||||
{
|
||||
"name": "@farmmaps/common-map3d",
|
||||
"version": "2.0.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@farmmaps/common-map3d",
|
||||
"version": "2.0.0",
|
||||
"dependencies": {
|
||||
"tslib": "^2.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@angular/common": "^18.2.3",
|
||||
"@angular/core": "^18.2.3",
|
||||
"cesium": "^1.97.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": {
|
||||
"version": "2.5.0",
|
||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
|
||||
"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": {
|
||||
"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": {
|
||||
"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 { 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 { AppCommonModule} from '@farmmaps/common';
|
||||
import { AppCommonMapModule} from '@farmmaps/common-map';
|
||||
|
||||
|
||||
@NgModule({
|
||||
declarations: [Switch2D3DComponent],
|
||||
imports: [
|
||||
AppCommonModule,
|
||||
AppCommonMapModule,
|
||||
AngularOpenlayersModule,
|
||||
AppCommonMapModule
|
||||
],
|
||||
exports: [Switch2D3DComponent]
|
||||
})
|
||||
|
||||
@ -1,15 +1,17 @@
|
||||
@import "~bootstrap/scss/bootstrap.scss";
|
||||
|
||||
.twotreed {
|
||||
display:block;
|
||||
width:2.5em;
|
||||
height:2.5em;
|
||||
background-color: var(--bs-body-bg);
|
||||
background-color: $body-bg;
|
||||
background-size: contain;
|
||||
margin-top:0.5em;
|
||||
text-align: center;
|
||||
line-height: 2.5em;
|
||||
border-radius: 1.75em;
|
||||
padding: 0;
|
||||
color: var(--bs-secondary);
|
||||
color: $secondary;
|
||||
}
|
||||
|
||||
.fa-spinner {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { Component, OnInit,Input,Host } from '@angular/core';
|
||||
import { Interaction} from 'ol/interaction';
|
||||
import { MapComponent } from '@farmmaps/ng-openlayers';
|
||||
import { MapComponent } from 'ngx-openlayers';
|
||||
import OLCesium from 'olcs/OLCesium';
|
||||
import RasterSynchronizer from 'olcs/RasterSynchronizer';
|
||||
import VectorSynchronizer from 'olcs/VectorSynchronizer';
|
||||
@ -15,10 +15,10 @@ import { Store } from '@ngrx/store';
|
||||
export class Switch2D3DComponent {
|
||||
|
||||
@Input() enable:boolean;
|
||||
public label = "3D";
|
||||
public label: string = "3D";
|
||||
private ol3d: OLCesium;
|
||||
private synchronizers:any[];
|
||||
public loading = true;
|
||||
public loading:boolean = true;
|
||||
private interactions:Interaction[] = [];
|
||||
|
||||
|
||||
@ -49,11 +49,7 @@ export class Switch2D3DComponent {
|
||||
this.interactions=[];
|
||||
this.map.instance.getInteractions().forEach((i) => {
|
||||
if(i.getActive()) {
|
||||
// AW-6241 TODO How to fix?
|
||||
// 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);
|
||||
this.interactions.push(i);
|
||||
i.setActive(false);
|
||||
}
|
||||
});
|
||||
|
||||
@ -8,6 +8,13 @@ import {
|
||||
platformBrowserDynamicTesting
|
||||
} 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.
|
||||
getTestBed().initTestEnvironment(
|
||||
BrowserDynamicTestingModule,
|
||||
@ -15,3 +22,7 @@ getTestBed().initTestEnvironment(
|
||||
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,
|
||||
"experimentalDecorators": true,
|
||||
"importHelpers": true,
|
||||
"esModuleInterop": true,
|
||||
"types": [],
|
||||
"lib": [
|
||||
"dom",
|
||||
"es2018"
|
||||
],
|
||||
"paths": {
|
||||
"@angular/*": [
|
||||
|
||||
"node_modules/@angular/*"
|
||||
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"angularCompilerOptions": {
|
||||
"skipTemplateCodegen": true,
|
||||
"strictMetadataEmit": true,
|
||||
"fullTemplateTypeCheck": true,
|
||||
"strictInjectionParameters": true,
|
||||
"enableResourceInlining": true,
|
||||
"compilationMode": "partial"
|
||||
"enableResourceInlining": true
|
||||
},
|
||||
"exclude": [
|
||||
"src/test.ts",
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user