FarmMaps/FarmMapsLib
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: FarmMaps:eed70c449b53d3a06770361cce59130de0ea8c74
Branches Tags
FarmMaps:develop FarmMaps:master FarmMaps:AW-4620 FarmMaps:2022.01 FarmMaps:feature/MinimizeSolution
FarmMaps:2026.02 FarmMaps:2025.08 FarmMaps:2024.10 FarmMaps:2024.04 FarmMaps:2023.10 FarmMaps:2023.08 FarmMaps:2023.03 FarmMaps:2022.08 FarmMaps:2022.05 FarmMaps:2022.03 FarmMaps:2021.09 FarmMaps:FarmMapsLib_0_0_1_prerelease_72
..
compare: FarmMaps:develop
Branches Tags
FarmMaps:develop FarmMaps:master FarmMaps:AW-4620 FarmMaps:2022.01 FarmMaps:feature/MinimizeSolution
FarmMaps:2026.02 FarmMaps:2025.08 FarmMaps:2024.10 FarmMaps:2024.04 FarmMaps:2023.10 FarmMaps:2023.08 FarmMaps:2023.03 FarmMaps:2022.08 FarmMaps:2022.05 FarmMaps:2022.03 FarmMaps:2021.09 FarmMaps:FarmMapsLib_0_0_1_prerelease_72

27 Commits
eed70c449b ... develop

Author SHA1 Message Date
jenkins
73d0a99cd6 [ci skip] Updated packages #2623
Some checks reported errors
FarmMaps.Develop/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
Details
2026-02-23 15:13:33 +00:00
Peter Bastiani
5991adf0c6 Shared services
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details
2026-02-23 16:12:05 +01:00
Peter Bastiani
d7ab7e84ce Shared services
Some checks failed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit
Details
2026-02-23 15:34:34 +01:00
Peter Bastiani
18092fcc24 Shared services
Some checks failed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit
Details
2026-02-23 15:22:32 +01:00
jenkins
5e84eb4404 [ci skip] Updated packages #2620
Some checks reported errors
FarmMaps.Develop/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
Details
2026-02-23 10:43:48 +00:00
Peter Bastiani
a5324c5164 Fix deps
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details
2026-02-23 11:41:32 +01:00
jenkins
7c2911afae [ci skip] Updated packages #2619
Some checks reported errors
FarmMaps.Develop/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
Details
2026-02-17 20:36:15 +00:00
Wilco Krikke
0fe20b6649 trigger build
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details
2026-02-17 21:34:18 +01:00
jenkins
c49534050a [ci skip] Updated packages #2618
Some checks reported errors
FarmMaps.Develop/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
Details
2026-02-17 15:52:00 +00:00
Wilco Krikke
bab870cc43 core js geupdated
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details
2026-02-17 16:50:37 +01:00
jenkins
cad022e772 [ci skip] Updated packages #2617
Some checks reported errors
FarmMaps.Develop/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
Details
2026-02-17 11:11:01 +00:00
jenkins
3b2ea10fdc [ci skip] Updated packages #2616
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details
2026-02-03 09:01:03 +00:00
Peter Bastiani
c20754e10a AW-7266 NG0956: The configured tracking expression (track by identity) caused re-creation of the entire collection
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details
2026-02-03 09:59:25 +01:00
jenkins
c4b8e9664c [ci skip] Updated packages #2615
Some checks reported errors
FarmMaps.Develop/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
Details
2026-01-30 12:55:46 +00:00
Peter Bastiani
7822015f8c Revert "NG0956 Tracking expression caused re-creation of the DOM structure."
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details 
This reverts commit 48261c9657.
 2026-01-30 13:54:24 +01:00
Peter Bastiani
48261c9657 NG0956 Tracking expression caused re-creation of the DOM structure.
Some checks failed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit
Details
2026-01-30 13:40:47 +01:00
jenkins
a6bd28ac45 [ci skip] Updated packages #2613
Some checks reported errors
FarmMaps.Develop/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
Details
2026-01-21 11:49:36 +00:00
jenkins
674a0f2a9e [ci skip] Updated packages #2612
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details
2026-01-21 11:32:36 +00:00
Peter Bastiani
77800fe0f7 feature/Aw6526Angular21
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details
2026-01-21 12:30:47 +01:00
Peter Bastiani
3251ba4022 Angular 20, oa. migrating from Karma to Vitest
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details
2026-01-21 11:53:59 +01:00
Peter Bastiani
a758a38a0a Angular 20, oa. migrating from Karma to Vitest
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details
2026-01-21 11:32:10 +01:00
Peter Bastiani
3c6a8e28c1 Angular 20, oa. migrating from Karma to Vitest
Some checks failed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit
Details
2026-01-21 11:25:38 +01:00
Peter Bastiani
b72e309fbe npm error ERESOLVE unable to resolve dependency tree
Some checks failed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit
Details
2026-01-20 18:01:58 +01:00
Peter Bastiani
d7b978c477 ERESOLVE unable to resolve dependency tree
Some checks failed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit
Details
2026-01-20 17:53:50 +01:00
Peter Bastiani
930d4fe0b7 Merge branch 'develop' into feature/AW6526Angular20
Some checks failed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit
Details 
# Conflicts:
#	package-lock.json
 2026-01-20 17:38:21 +01:00
Peter Bastiani
642ea33c3c Angular v20 2026-01-20 17:36:35 +01:00
Peter Bastiani
429ab24408 Angular v20 2026-01-20 17:11:03 +01:00
86 changed files with 10183 additions and 11586 deletions
Expand all files Collapse all files

2
README.md
View File

@@ -61,4 +61,4 @@ npm run lint src
npm run lint projects/common/src npm run lint projects/common/src
npm run lint projects/common-map/src npm run lint projects/common-map/src
npm run lint projects/common-map3d/src npm run lint projects/common-map3d/src
``` ```

79
angular.json
View File

@@ -133,39 +133,10 @@
} }
}, },
"test": { "test": {
"builder": "@angular-devkit/build-angular:karma", "builder": "@angular/build:unit-test",
"options": { "options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json", "tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js", "browsers": ["chromium"]
"styles": [
"src/styles.css"
],
"scripts": [],
"assets": [
"src/favicon.ico",
"src/assets"
]
}
}
}
},
"farmmaps-lib-app-e2e": {
"root": "e2e/",
"projectType": "application",
"prefix": "",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "farmmaps-lib-app:serve"
},
"configurations": {
"production": {
"devServerTarget": "farmmaps-lib-app:serve:production"
}
} }
} }
} }
@@ -189,11 +160,10 @@
} }
}, },
"test": { "test": {
"builder": "@angular-devkit/build-angular:karma", "builder": "@angular/build:unit-test",
"options": { "options": {
"main": "projects/common/src/test.ts",
"tsConfig": "projects/common/tsconfig.spec.json", "tsConfig": "projects/common/tsconfig.spec.json",
"karmaConfig": "projects/common/karma.conf.js" "browsers": ["chromium"]
} }
} }
} }
@@ -217,11 +187,10 @@
} }
}, },
"test": { "test": {
"builder": "@angular-devkit/build-angular:karma", "builder": "@angular/build:unit-test",
"options": { "options": {
"main": "projects/common-map/src/test.ts",
"tsConfig": "projects/common-map/tsconfig.spec.json", "tsConfig": "projects/common-map/tsconfig.spec.json",
"karmaConfig": "projects/common-map/karma.conf.js" "browsers": ["chromium"]
} }
} }
} }
@@ -245,11 +214,10 @@
} }
}, },
"test": { "test": {
"builder": "@angular-devkit/build-angular:karma", "builder": "@angular/build:unit-test",
"options": { "options": {
"main": "projects/common-map3d/src/test.ts",
"tsConfig": "projects/common-map3d/tsconfig.spec.json", "tsConfig": "projects/common-map3d/tsconfig.spec.json",
"karmaConfig": "projects/common-map3d/karma.conf.js" "browsers": ["chromium"]
} }
} }
} }
@@ -273,11 +241,10 @@
} }
}, },
"test": { "test": {
"builder": "@angular-devkit/build-angular:karma", "builder": "@angular/build:unit-test",
"options": { "options": {
"main": "projects/ng-openlayers/src/test.ts",
"tsConfig": "projects/ng-openlayers/tsconfig.spec.json", "tsConfig": "projects/ng-openlayers/tsconfig.spec.json",
"karmaConfig": "projects/ng-openlayers/karma.conf.js" "browsers": ["chromium"]
} }
}, },
"lint": { "lint": {
@@ -294,5 +261,31 @@
}, },
"cli": { "cli": {
"analytics": false "analytics": false
},
"schematics": {
"@schematics/angular:component": {
"type": "component"
},
"@schematics/angular:directive": {
"type": "directive"
},
"@schematics/angular:service": {
"type": "service"
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
}
} }
} }

28
e2e/protractor.conf.js
View File

@@ -1,28 +0,0 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
const { SpecReporter } = require('jasmine-spec-reporter');
exports.config = {
allScriptsTimeout: 11000,
specs: [
'./src/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome'
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
},
onPrepare() {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.e2e.json')
});
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
}
};

23
e2e/src/app.e2e-spec.ts
View File

@@ -1,23 +0,0 @@
import { AppPage } from './app.po';
import { browser, logging } from 'protractor';
describe('workspace-project App', () => {
let page: AppPage;
beforeEach(() => {
page = new AppPage();
});
it('should display welcome message', () => {
page.navigateTo();
expect(page.getTitleText()).toEqual('Welcome to farmmaps-lib-app!');
});
afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
expect(logs).not.toContain(jasmine.objectContaining({
level: logging.Level.SEVERE,
} as logging.Entry));
});
});

11
e2e/src/app.po.ts
View File

@@ -1,11 +0,0 @@
import { browser, by, element } from 'protractor';
export class AppPage {
navigateTo() {
return browser.get(browser.baseUrl) as Promise<any>;
}
getTitleText() {
return element(by.css('app-root h1')).getText() as Promise<string>;
}
}

13
e2e/tsconfig.e2e.json
View File

@@ -1,13 +0,0 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"module": "commonjs",
"target": "es5",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
}

16095
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

111
package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "4.20.0", "version": "4.22.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
"build": "ng build", "build": "ng build",
@@ -10,44 +10,44 @@
"e2e": "ng e2e" "e2e": "ng e2e"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular-eslint/eslint-plugin": "^18.2.0", "@angular-eslint/eslint-plugin": "20.7.0",
"@angular/animations": "19.2.18", "@angular/animations": "^21.1.0",
"@angular/common": "19.2.18", "@angular/common": "^21.1.0",
"@angular/compiler": "19.2.18", "@angular/compiler": "^21.1.0",
"@angular/core": "19.2.18", "@angular/core": "^21.1.0",
"@angular/forms": "19.2.18", "@angular/forms": "^21.1.0",
"@angular/platform-browser": "19.2.18", "@angular/platform-browser": "^21.1.0",
"@angular/platform-browser-dynamic": "19.2.18", "@angular/platform-browser-dynamic": "^21.1.0",
"@angular/router": "19.2.18", "@angular/router": "^21.1.0",
"@farmmaps/common": "file:dist/common", "@farmmaps/common": "file:dist/common",
"@farmmaps/common-map": "file:dist/common-map", "@farmmaps/common-map": "file:dist/common-map",
"@farmmaps/common-map3d": "file:dist/common-map3d", "@farmmaps/common-map3d": "file:dist/common-map3d",
"@farmmaps/ng-openlayers": "file:dist/ng-openlayers", "@farmmaps/ng-openlayers": "file:dist/ng-openlayers",
"@microsoft/signalr": "^3.1.16", "@microsoft/signalr": "^10.0.0",
"@ng-bootstrap/ng-bootstrap": "^18.0.0", "@ng-bootstrap/ng-bootstrap": "^20.0.0",
"@ngrx/effects": "19.2.1", "@ngrx/effects": "^21.0.1",
"@ngrx/router-store": "19.2.1", "@ngrx/router-store": "^21.0.1",
"@ngrx/store": "19.2.1", "@ngrx/store": "^21.0.1",
"@popperjs/core": "^2.11.8", "@popperjs/core": "2.11.8",
"angular-oauth2-oidc": "^17.0.2", "angular-oauth2-oidc": "^20.0.2",
"assert": "^2.0.0", "assert": "^2.1.0",
"bootstrap": "^5.3.3", "bootstrap": "^5.3.8",
"browserify-zlib": "^0.2.0", "browserify-zlib": "^0.2.0",
"buffer": "^6.0.3", "buffer": "^6.0.3",
"cesium": "^1.97.0", "cesium": "^1.97.0",
"core-js": "^2.6.12", "core-js": "^3.48.0",
"https-browserify": "^1.0.0", "https-browserify": "^1.0.0",
"moment": "^2.29.4", "moment": "^2.29.4",
"ngrx-store-localstorage": "19.0.2", "ngrx-store-localstorage": "^20.1.0",
"ngx-avatars": "1.9.3", "ngx-avatars": "1.10.1",
"ngx-clipboard": "^16.0.0", "ngx-clipboard": "^16.0.0",
"ngx-image-cropper": "^7.0.0", "ngx-image-cropper": "^7.0.0",
"ngx-uploadx": "7.0.1", "ngx-uploadx": "^7.0.1",
"ol": "^8.2.0", "ol": "^8.2.0",
"olcs": "^2.13.1", "olcs": "^2.13.1",
"resumablejs": "^1.1.0", "resumablejs": "^1.1.0",
"rxjs": "^7.8.1", "rxjs": "^7.8.0",
"stream": "^0.0.2", "stream": "^0.0.2",
"stream-http": "^3.2.0", "stream-http": "^3.2.0",
"tassign": "^1.0.0", "tassign": "^1.0.0",
@@ -56,42 +56,43 @@
"util": "^0.12.4", "util": "^0.12.4",
"zone.js": "~0.15.1" "zone.js": "~0.15.1"
}, },
"optionalDependencies": { "optionalDependencies": {
"@lmdb/lmdb-linux-x64": "^3.1.0", "@lmdb/lmdb-linux-x64": "^3.1.0",
"@rollup/rollup-linux-x64-gnu": "^4.21.2" "@rollup/rollup-linux-x64-gnu": "^4.21.2"
}, },
"devDependencies": { "devDependencies": {
"@angular-builders/custom-webpack": "19.0.1", "@angular-builders/custom-webpack": "^21.0.3",
"@angular-devkit/build-angular": "19.2.19", "@angular-devkit/build-angular": "^21.1.0",
"@angular/cli": "19.2.19", "@angular/build": "^21.1.0",
"@angular/compiler-cli": "19.2.18", "@angular/cli": "^21.1.0",
"@angular/language-service": "19.2.18", "@angular/compiler-cli": "^21.1.0",
"@angular/localize": "19.2.18", "@angular/language-service": "^21.1.0",
"@angular/localize": "^21.1.0",
"@types/arcgis-rest-api": "^10.4.5", "@types/arcgis-rest-api": "^10.4.5",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "^2.0.9",
"@types/node": "^22.5.4", "@types/node": "^22.5.4",
"@typescript-eslint/eslint-plugin": "^6.18.0", "@typescript-eslint/eslint-plugin": "^8.53.1",
"@typescript-eslint/eslint-plugin-tslint": "^6.18.0", "@typescript-eslint/parser": "^8.53.1",
"@typescript-eslint/parser": "^6.18.0", "@vitest/browser": "^4.0.17",
"codelyzer": "^6.0.2", "@vitest/browser-playwright": "^4.0.17",
"eslint": "^8.35.0", "eslint": "^9.39.2",
"eslint-config-prettier": "^8.6.0", "eslint-config-prettier": "^10.1.8",
"eslint-plugin-import": "^2.27.5", "eslint-plugin-import": "^2.32.0",
"jasmine-core": "^4.3.0", "jsdom": "^27.4.0",
"jasmine-spec-reporter": "^7.0.0", "ng-packagr": "^21.1.0",
"karma": "^6.3.20",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "^3.0.3",
"karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.0.0",
"ng-packagr": "^19.2.2",
"protractor": "~7.0.0",
"ts-node": "^8.8.1", "ts-node": "^8.8.1",
"typescript": "~5.8.3" "typescript": "~5.9.3",
"vitest": "^4.0.17"
}, },
"overrides": { "overrides": {
"some-library": { "ngrx-store-localstorage": {
"@angular/common": "$@angular/common",
"@angular/core": "$@angular/core"
},
"ngx-avatars": {
"@angular/common": "$@angular/common",
"@angular/core": "$@angular/core"
},
"ngx-uploadx": {
"@angular/common": "$@angular/common", "@angular/common": "$@angular/common",
"@angular/core": "$@angular/core" "@angular/core": "$@angular/core"
} }

138
projects/common-map/package-lock.json generated
View File

@@ -11,11 +11,11 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "^18.2.3", "@angular/core": "20.3.16",
"@ngrx/effects": "^18.0.2", "@ngrx/effects": "20.1.0",
"@ngrx/router-store": "^18.0.2", "@ngrx/router-store": "20.1.0",
"@ngrx/store": "^18.0.2", "@ngrx/store": "20.1.0",
"ngrx-store-localstorage": "^18", "ngrx-store-localstorage": "20.1.0",
"tassign": "^1.0.0" "tassign": "^1.0.0"
} }
}, },
@@ -36,52 +36,64 @@
"extraneous": true "extraneous": true
}, },
"node_modules/@angular/common": { "node_modules/@angular/common": {
"version": "18.2.3", "version": "20.3.16",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.3.tgz", "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.16.tgz",
"integrity": "sha512-NFL4yXXImSCH7i1xnHykUjHa9vl9827fGiwSV2mnf7LjSUsyDzFD8/54dNuYN9OY8AUD+PnK0YdNro6cczVyIA==", "integrity": "sha512-GRAziNlntwdnJy3F+8zCOvDdy7id0gITjDnM6P9+n2lXvtDuBLGJKU3DWBbvxcCjtD6JK/g/rEX5fbCxbUHkQQ==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^18.19.1 || ^20.11.1 || >=22.0.0" "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "18.2.3", "@angular/core": "20.3.16",
"rxjs": "^6.5.3 || ^7.4.0" "rxjs": "^6.5.3 || ^7.4.0"
} }
}, },
"node_modules/@angular/core": { "node_modules/@angular/core": {
"version": "18.2.3", "version": "20.3.16",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.3.tgz", "resolved": "https://registry.npmjs.org/@angular/core/-/core-20.3.16.tgz",
"integrity": "sha512-VGhMJxj7d0rYpqVfQrcGRB7EE/BCziotft/I/YPl6bOMPSAvMukG7DXQuJdYpNrr62ks78mlzHlZX/cdmB9Prw==", "integrity": "sha512-KSFPKvOmWWLCJBbEO+CuRUXfecX2FRuO0jNi9c54ptXMOPHlK1lIojUnyXmMNzjdHgRug8ci9qDuftvC2B7MKg==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^18.19.1 || ^20.11.1 || >=22.0.0" "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/compiler": "20.3.16",
"rxjs": "^6.5.3 || ^7.4.0", "rxjs": "^6.5.3 || ^7.4.0",
"zone.js": "~0.14.10" "zone.js": "~0.15.0"
},
"peerDependenciesMeta": {
"@angular/compiler": {
"optional": true
},
"zone.js": {
"optional": true
}
} }
}, },
"node_modules/@angular/platform-browser": { "node_modules/@angular/platform-browser": {
"version": "18.2.3", "version": "20.3.16",
"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.3.tgz", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-20.3.16.tgz",
"integrity": "sha512-M2ob4zN7tAcL2mx7U6KnZNqNFPFl9MlPBE0FrjQjIzAjU0wSYPIJXmaPu9aMUp9niyo+He5iX98I+URi2Yc99g==", "integrity": "sha512-YsrLS6vyS77i4pVHg4gdSBW74qvzHjpQRTVQ5Lv/OxIjJdYYYkMmjNalCNgy1ZuyY6CaLIB11ccxhrNnxfKGOQ==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^18.19.1 || ^20.11.1 || >=22.0.0" "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/animations": "18.2.3", "@angular/animations": "20.3.16",
"@angular/common": "18.2.3", "@angular/common": "20.3.16",
"@angular/core": "18.2.3" "@angular/core": "20.3.16"
}, },
"peerDependenciesMeta": { "peerDependenciesMeta": {
"@angular/animations": { "@angular/animations": {
@@ -90,76 +102,67 @@
} }
}, },
"node_modules/@angular/router": { "node_modules/@angular/router": {
"version": "18.2.3", "version": "20.3.16",
"resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.3.tgz", "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.16.tgz",
"integrity": "sha512-fvD9eSDIiIbeYoUokoWkXzu7/ZaxlzKPUHFqX1JuKuH5ciQDeT/d7lp4mj31Bxammhohzi3+z12THJYsCkj/iQ==", "integrity": "sha512-e1LiQFZaajKqc00cY5FboIrWJZSMnZ64GDp5R0UejritYrqorQQQNOqP1W85BMuY2owibMmxVfX+dJg/Mc8PuQ==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^18.19.1 || ^20.11.1 || >=22.0.0" "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "18.2.3", "@angular/common": "20.3.16",
"@angular/core": "18.2.3", "@angular/core": "20.3.16",
"@angular/platform-browser": "18.2.3", "@angular/platform-browser": "20.3.16",
"rxjs": "^6.5.3 || ^7.4.0" "rxjs": "^6.5.3 || ^7.4.0"
} }
}, },
"node_modules/@ngrx/effects": { "node_modules/@ngrx/effects": {
"version": "18.0.2", "version": "20.1.0",
"resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-18.0.2.tgz", "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-20.1.0.tgz",
"integrity": "sha512-YojXcOD9Lsq4kl2HCjENccyUM/mOlgBdtddsg9j/ojzSUgu3ZuBVKLN3atrL2TJYkbMX1MN0RzafSkL3TPGFIA==", "integrity": "sha512-wkIu0QnTarBd1zUswk643H5SILO9Be1OeswMe7g4tXlkNLFRPkyu0BUzXT80PsUPP5p0VrdFz3akrn3HHjjTjA==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@ngrx/operators": "18.0.1",
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "^18.0.0", "@angular/core": "^20.0.0",
"@ngrx/store": "18.0.2", "@ngrx/store": "20.1.0",
"rxjs": "^6.5.3 || ^7.5.0" "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": { "node_modules/@ngrx/router-store": {
"version": "18.0.2", "version": "20.1.0",
"resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-18.0.2.tgz", "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-20.1.0.tgz",
"integrity": "sha512-jUrQ/uJJ53x8O1XbN2YxH2GpRREZlwS5gRxlCoc4fWL4Us/uS1/K6+QfRmKBPtpTKBIixqsOb+dIUV5iwBrivA==", "integrity": "sha512-XlpQsgmEc1E9Ogiv6QbJ8g8JzjrJOlr7JX9FngHIDLyXQFCMn5wcXsqhjiBjG9JgJLwlzV+v14i7EM/nqwQCGA==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "^18.0.0", "@angular/common": "^20.0.0",
"@angular/core": "^18.0.0", "@angular/core": "^20.0.0",
"@angular/router": "^18.0.0", "@angular/router": "^20.0.0",
"@ngrx/store": "18.0.2", "@ngrx/store": "20.1.0",
"rxjs": "^6.5.3 || ^7.5.0" "rxjs": "^6.5.3 || ^7.5.0"
} }
}, },
"node_modules/@ngrx/store": { "node_modules/@ngrx/store": {
"version": "18.0.2", "version": "20.1.0",
"resolved": "https://registry.npmjs.org/@ngrx/store/-/store-18.0.2.tgz", "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-20.1.0.tgz",
"integrity": "sha512-ajwv0+njsO4vzArp9esnFvs1wyUb1U1W8E8LSCKrcW2hWWo9o1Pezj+JRsdQwatxHfrrPFuTDyajsl6GQM/JSA==", "integrity": "sha512-o8j3CGAGedm+BIb+QDhNXrVaU//n9uF0wH0HZWtXHmW1mjRBaQiUA+ZPMUkDwAeN8KuOcoIEC+2QUXxXGVI7ow==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "^18.0.0", "@angular/core": "^20.0.0",
"rxjs": "^6.5.3 || ^7.5.0" "rxjs": "^6.5.3 || ^7.5.0"
} }
}, },
@@ -173,18 +176,19 @@
} }
}, },
"node_modules/ngrx-store-localstorage": { "node_modules/ngrx-store-localstorage": {
"version": "18.0.0", "version": "20.1.0",
"resolved": "https://registry.npmjs.org/ngrx-store-localstorage/-/ngrx-store-localstorage-18.0.0.tgz", "resolved": "https://registry.npmjs.org/ngrx-store-localstorage/-/ngrx-store-localstorage-20.1.0.tgz",
"integrity": "sha512-WoDePvMWiWF9LQHe+dTqbpm8lxoKCPoIvA0/1enIPTmdLQsOpdDKhMSD5YgwuqDusNfEik3QslProTFGyXZwtw==", "integrity": "sha512-/5+i5qTxZdE8Q5qdSmj7+9JvriAnHwW7RsXzh1rrQ/UHA9vf12q6mJ6wYTTehUO4Qcl2t/K5MRkooN2eG2ZEvw==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"deepmerge": "^4.2.2", "deepmerge": "^4.2.2",
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "^18.0.1", "@angular/common": ">=20.0.0",
"@angular/core": "^18.0.1", "@angular/core": ">=20.0.0",
"@ngrx/store": "^18.0.0" "@ngrx/store": ">=20.0.0"
} }
}, },
"node_modules/rxjs": { "node_modules/rxjs": {
@@ -206,12 +210,6 @@
"version": "2.7.0", "version": "2.7.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" "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
} }
} }
} }

15
projects/common-map/package.json
View File

@@ -8,11 +8,16 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "19.2.18", "@angular/core": "^21.1.0",
"ngrx-store-localstorage": "19.0.2", "ngrx-store-localstorage": "^20.1.0",
"@ngrx/effects": "19.2.1", "@ngrx/effects": "^21.0.1",
"@ngrx/router-store": "19.2.1", "@ngrx/router-store": "^21.0.1",
"@ngrx/store": "19.2.1", "@ngrx/store": "^21.0.1",
"tassign": "^1.0.0" "tassign": "^1.0.0"
},
"overrides": {
"ngrx-store-localstorage": {
"@angular/core": "$@angular/core"
}
} }
} }

81
projects/common-map/src/fm-map/components/aol/layer-list/layer-list.component.html
View File

@@ -1,31 +1,50 @@
<div> <div>
<div class="layerlist" *ngIf="itemLayers.length > 0;else noLayers"> @if (itemLayers.length > 0) {
<div class="list-group"> <div class="layerlist">
<div *ngFor="let itemLayer of itemLayers" class="list-group-item list-group-item-action p-2 text-truncate" [ngClass]="{'active' : selectedLayer==itemLayer}"> <div class="list-group">
<div (click)="handleSelectLayer($event,itemLayer)" [title]="itemLayer.item.name">{{itemLayer.item.name}}</div> @for (itemLayer of itemLayers; track itemLayer.item.code) {
<div class="mt-1" *ngIf="selectedLayer==itemLayer && !baseLayers"> <div class="list-group-item list-group-item-action p-2 text-truncate" [ngClass]="{'active' : selectedLayer==itemLayer}">
<span class="btn-group"> <div (click)="handleSelectLayer($event,itemLayer)" [title]="itemLayer.item.name">{{itemLayer.item.name}}</div>
<a title="Toggle visibility"href="#" class="btn btn-light btn-sm" (click)="handleToggleVisibility($event,itemLayer)"><i class="fa" aria-hidden="true" [ngClass]="{'fa-eye':!itemLayer.visible,'fa-eye-slash':itemLayer.visible}"></i></a> @if (selectedLayer==itemLayer && !baseLayers) {
<a title="Transparency 25%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.25)">25%</a> <div class="mt-1">
<a title="Transparency 50%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.5)">50%</a> <span class="btn-group">
<a title="Transparency 75%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.75)">75%</a> <a title="Toggle visibility"href="#" class="btn btn-light btn-sm" (click)="handleToggleVisibility($event,itemLayer)"><i class="fa" aria-hidden="true" [ngClass]="{'fa-eye':!itemLayer.visible,'fa-eye-slash':itemLayer.visible}"></i></a>
<a title="No transparency" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,1)">100%</a> @if (itemLayer.visible) {
</span> <a title="Transparency 25%" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.25)">25%</a>
<a href="#" title="Zoom to extent" class="btn btn-light btn-sm" (click)="handleZoomToExtent($event,itemLayer)"><i class="far fa-search-plus" aria-hidden="true"></i></a> }
<span *ngIf="firstLayer(itemLayer)"><a href="#" title="Toggle legend" class="btn btn-light btn-sm" (click)="itemLayer.legendVisible=toggleLegend($event,itemLayer.legendVisible)"><i class="far fa-chart-bar" aria-hidden="true"></i></a></span> @if (itemLayer.visible) {
<span *ngIf="!dataLayers" class="float-end"><a href="#" title="Remove overlay" class="btn btn-light btn-sm" (click)="handleDelete($event,itemLayer)"><i class="fas fa-layer-minus" aria-hidden="true"></i></a></span> <a title="Transparency 50%" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.5)">50%</a>
</div> }
<div *ngIf="itemLayer.legendVisible"> @if (itemLayer.visible) {
<div class="card legend"> <a title="Transparency 75%" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.75)">75%</a>
<fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);" [histogramenabled]="true"></fm-map-layer-legend> }
</div> @if (itemLayer.visible) {
</div> <a title="No transparency" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,1)">100%</a>
</div> }
</div> </span>
</div> <a href="#" title="Zoom to extent" class="btn btn-light btn-sm" (click)="handleZoomToExtent($event,itemLayer)"><i class="far fa-search-plus" aria-hidden="true"></i></a>
</div> @if (firstLayer(itemLayer)) {
<ng-template #noLayers> <span><a href="#" title="Toggle legend" class="btn btn-light btn-sm" (click)="itemLayer.legendVisible=toggleLegend($event,itemLayer.legendVisible)"><i class="far fa-chart-bar" aria-hidden="true"></i></a></span>
<div class="list-group"> }
<div class="list-group-item" i18n>No layers</div> @if (!dataLayers) {
</div> <span class="float-end"><a href="#" title="Remove overlay" class="btn btn-light btn-sm" (click)="handleDelete($event,itemLayer)"><i class="fas fa-layer-minus" aria-hidden="true"></i></a></span>
</ng-template> }
</div>
}
@if (itemLayer.legendVisible) {
<div>
<div class="card legend">
<fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);" [histogramenabled]="true"></fm-map-layer-legend>
</div>
</div>
}
</div>
}
</div>
</div>
} @else {
<div class="list-group">
<div class="list-group-item" i18n>No layers</div>
</div>
}
</div>

43
projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.html
View File

@@ -1,18 +1,27 @@
<div #layerValues class="layer-values"> <div #layerValues class="layer-values">
<div class="cross" *ngIf="enabled$ | async"> @if (enabled$ | async) {
<div class="pointer"></div> <div class="cross" >
<div class="values-container border border-dark rounded p-2" *ngIf="(layerValues$ | async ) as layers"> <div class="pointer"></div>
<div class="lonlat pb-2 "><span class="font-weight-bold">{{lonlat$}}</span><i class="ms-2 fal fa-copy" (click)="copyToClipboard()"></i> </div> @if ((layerValues$ | async ); as layers) {
<ul class="value-list p-0 mb-0" *ngIf="layers.length>0 ;else no_data"> <div class="values-container border border-dark rounded p-2">
<li class="border-top pt-1 pb-1 value" *ngFor="let layerValue of layers"> <div class="lonlat pb-2 "><span class="font-weight-bold">{{lonlat$}}</span><i class="ms-2 fal fa-copy" (click)="copyToClipboard()"></i> </div>
<div>{{layerValue.layerName}}</div> @if (layers.length>0 ) {
<div>{{layerValue.date|date}}</div> <ul class="value-list p-0 mb-0">
<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> @for (layerValue of layers; track $index) {
</li> <li class="border-top pt-1 pb-1 value">
</ul> <div>{{layerValue.layerName}}</div>
<ng-template #no_data> <div>{{layerValue.date|date}}</div>
<div i18n class="border-top pt-1 pb-1">No data at location</div> <div>@if (layerValue.quantity) {
</ng-template> <span><span class="me-1">{{layerValue.quantity}}</span> </span>
</div> }<span class="me-1 font-weight-bold">{{getScaledValue(layerValue)}}</span><span>{{layerValue.unit}}</span></div>
</div> </li>
</div> }
</ul>
} @else {
<div i18n class="border-top pt-1 pb-1">No data at location</div>
}
</div>
}
</div>
}
</div>

34
projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.html
View File

@@ -1,14 +1,20 @@
<div class="card border-0"> <div class="card border-0">
<div class="card-body" *ngIf="(schemeItem|async);let schemeItem"> @if ((schemeItem|async); as schemeItem) {
<fm-back-button></fm-back-button> <div class="card-body">
<h4 i18n>Farm</h4> <fm-back-button></fm-back-button>
<h3>{{schemeItem.name}}</h3> <h4 i18n>Farm</h4>
<div *ngIf="features;let features"> <h3>{{schemeItem.name}}</h3>
<div class="cropfields"> @if (features; as features) {
<div class="row m-0 ps-3 pe-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)"> <div>
<fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container> <div class="cropfields">
</div> @for (feature of features; track $index) {
</div> <div class="row m-0 ps-3 pe-3" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
</div> <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
</div> </div>
</div> }
</div>
</div>
}
</div>
}
</div>

30
projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html
View File

@@ -1,13 +1,17 @@
<div class="card border-0"> <div class="card border-0">
<div class="card-body"> <div class="card-body">
<fm-back-button></fm-back-button> <fm-back-button></fm-back-button>
<h3><i class="far fa-farm"></i>&nbsp;<span i18n>Farms</span></h3> <h3><i class="far fa-farm"></i>&nbsp;<span i18n>Farms</span></h3>
<div *ngIf="features;let features"> @if (features; as features) {
<div class="farms"> <div>
<div class="row m-0 ps-3 pe-3" *ngFor="let feature of features"[ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)"> <div class="farms">
<fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container> @for (feature of features; track $index) {
</div> <div class="row m-0 ps-3 pe-3"[ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
</div> <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
</div> </div>
</div> }
</div> </div>
</div>
}
</div>
</div>

30
projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.html
View File

@@ -1,14 +1,16 @@
<div *ngIf="feature;let feature" class="d-flex m-0"> @if (feature; as feature) {
<div class="p-2"> <div class="d-flex m-0">
<div class="thumbnail"> <div class="p-2">
<fm-map-feature-thumbnail [feature]="feature"></fm-map-feature-thumbnail> <div class="thumbnail">
</div> <fm-map-feature-thumbnail [feature]="feature"></fm-map-feature-thumbnail>
</div> </div>
<div class="flex-grow p-2 overflow-hidden"> </div>
<h1 class="card-title" title="{{feature.get('name')}}">{{feature.get('name')}}</h1> <div class="flex-grow p-2 overflow-hidden">
<div class="card-text"><span>{{areaInHa(feature)| number:'1.2-2'}} <h1 class="card-title" title="{{feature.get('name')}}">{{feature.get('name')}}</h1>
ha</span>&nbsp;<span>{{feature.get('cropTypeName')}}</span> </div> <div class="card-text"><span>{{areaInHa(feature)| number:'1.2-2'}}
<div class="card-text"><span>{{feature.get('datadate')|date}}</span> - ha</span>&nbsp;<span>{{feature.get('cropTypeName')}}</span> </div>
<span>{{feature.get('dataenddate')|date}}</span> </div> <div class="card-text"><span>{{feature.get('datadate')|date}}</span> -
</div> <span>{{feature.get('dataenddate')|date}}</span> </div>
</div> </div>
</div>
}

6
projects/common-map/src/fm-map/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.html
View File

@@ -1,6 +1,8 @@
<div *ngIf="feature;let feature" class="row m-0"> @if (feature; as feature) {
<div class="row m-0">
<div class="col p-2"> <div class="col p-2">
<h1 class="card-title" title="{{feature.get('name')}}">{{feature.get('name')}}</h1> <h1 class="card-title" title="{{feature.get('name')}}">{{feature.get('name')}}</h1>
<div class="card-text">{{feature.get('datadate')|date:'shortDate'}}</div> <div class="card-text">{{feature.get('datadate')|date:'shortDate'}}</div>
</div> </div>
</div> </div>
}

18
projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.html
View File

@@ -1,12 +1,18 @@
<div *ngIf="feature;let feature" class="row m-0"> @if (feature; as feature) {
<div class="row m-0">
<div class="col-3 w-25 m-0 p-2 thumbnail"> <div class="col-3 w-25 m-0 p-2 thumbnail">
<img *ngIf="feature.get('thumbnail')" [src]="config.getConfig('apiEndPoint') + '/api/v1/items/'+feature.get('code')+'/thumbnail'" /> @if (feature.get('thumbnail')) {
<div *ngIf="!feature.get('thumbnail')" [style.background-color]="itemTypeService.getColor(feature.get('itemType'))"> <img [src]="config.getConfig('apiEndPoint') + '/api/v1/items/'+feature.get('code')+'/thumbnail'" />
<i [ngClass]="itemTypeService.getIcon(feature.get('itemType'))"></i> }
</div> @if (!feature.get('thumbnail')) {
<div [style.background-color]="itemTypeService.getColor(feature.get('itemType'))">
<i [ngClass]="itemTypeService.getIcon(feature.get('itemType'))"></i>
</div>
}
</div> </div>
<div class="col p-2"> <div class="col p-2">
<h1 class="card-title" title="{{feature.get('name')}}"><i [ngClass]="itemTypeService.getIcon(feature.get('itemType'))" [style.color]="itemTypeService.getColor(feature.get('itemType'))"></i>&nbsp;{{feature.get('name')}}</h1> <h1 class="card-title" title="{{feature.get('name')}}"><i [ngClass]="itemTypeService.getIcon(feature.get('itemType'))" [style.color]="itemTypeService.getColor(feature.get('itemType'))"></i>&nbsp;{{feature.get('name')}}</h1>
<div class="card-text">{{feature.get('datadate')|date:'shortDate'}}</div> <div class="card-text">{{feature.get('datadate')|date:'shortDate'}}</div>
</div> </div>
</div> </div>
}

34
projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.html
View File

@@ -1,14 +1,20 @@
<div class="card border-0"> <div class="card border-0">
<div class="card-body" *ngIf="(schemeItem|async);let schemeItem"> @if ((schemeItem|async); as schemeItem) {
<fm-back-button></fm-back-button> <div class="card-body">
<h4 i18n>Farm</h4> <fm-back-button></fm-back-button>
<h3>{{schemeItem.name}}</h3> <h4 i18n>Farm</h4>
<div *ngIf="features;let features"> <h3>{{schemeItem.name}}</h3>
<div class="cropfields"> @if (features; as features) {
<div class="row m-0 ps-3 pe-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)"> <div>
<fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container> <div class="cropfields">
</div> @for (feature of features; track $index) {
</div> <div class="row m-0 ps-3 pe-3" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
</div> <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
</div> </div>
</div> }
</div>
</div>
}
</div>
}
</div>

16
projects/common-map/src/fm-map/components/feature-list/feature-list.component.html
View File

@@ -1,6 +1,10 @@
<div *ngIf="features;let features"> @if (features; as features) {
<fm-back-button></fm-back-button> <div>
<div class="row m-0 ps-3 pe-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)"> <fm-back-button></fm-back-button>
<fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container> @for (feature of features; track $index) {
</div> <div class="row m-0 ps-3 pe-3" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
</div> <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
</div>
}
</div>
}

10
projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.html
View File

@@ -1,4 +1,6 @@
<div *ngIf="item;let item" class="widget" [style.background-color]="itemTypeService.getColor(item.itemType)"> @if (item; as item) {
<div class="align-middle icon" [ngClass]="itemTypeService.getIcon(item.itemType)"></div> <div class="widget" [style.background-color]="itemTypeService.getColor(item.itemType)">
<div class="title">{{item.name}}</div> <div class="align-middle icon" [ngClass]="itemTypeService.getIcon(item.itemType)"></div>
</div> <div class="title">{{item.name}}</div>
</div>
}

16
projects/common-map/src/fm-map/components/item-list/item-list.component.html
View File

@@ -1,7 +1,11 @@
<div *ngIf="items;let items" class="widget-container pt-0"> @if (items; as items) {
<div class="widget" *ngFor="let item of items" (click)="handleItemClick(item)"> <div class="widget-container pt-0">
<div class="content"> @for (item of items; track item.code) {
<fm-map-item-list-item-container [item]="item" class="item-container"></fm-map-item-list-item-container> <div class="widget" (click)="handleItemClick(item)">
</div> <div class="content">
<fm-map-item-list-item-container [item]="item" class="item-container"></fm-map-item-list-item-container>
</div>
</div>
}
</div> </div>
</div> }

16
projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.html
View File

@@ -1,7 +1,11 @@
<div *ngIf="widgets;let widgets" class="widget-container pt-0"> @if (widgets; as widgets) {
<div class="widget" *ngFor="let widget of widgets"> <div class="widget-container pt-0">
<div class="content"> @for (widget of widgets; track widget.item.code) {
<ng-template #widgetTemplate></ng-template> <div class="widget">
</div> <div class="content">
<ng-template #widgetTemplate></ng-template>
</div>
</div>
}
</div> </div>
</div> }

76
projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html
View File

@@ -1,37 +1,39 @@
<div class="btn btn-outline-primary layer-switcher" (click)="handleClick($event)"> <div class="btn btn-outline-primary layer-switcher" (click)="handleClick($event)">
<i class="fal fa-layer-group"></i> <i class="fal fa-layer-group"></i>
<div class="layers hidden" [ngClass]="{'hidden':!(showLayerSwitcher|async)}" (click)="$event.stopPropagation();"> <div class="layers hidden" [ngClass]="{'hidden':!(showLayerSwitcher|async)}" (click)="$event.stopPropagation();">
<div class="card layers-card m-1"> <div class="card layers-card m-1">
<div class="card-header"> <div class="card-header">
<span i18n>Layers</span> <span i18n>Layers</span>
<i class="float-end fas fa-times" (click)="close($event)"></i> <i class="float-end fas fa-times" (click)="close($event)"></i>
</div> </div>
<ul class="navbar-nav"> <ul class="navbar-nav">
<li class="nav-item py-0"> <li class="nav-item py-0">
<span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Base maps</span></span> <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Base maps</span></span>
<div class="mb-4"> <div class="mb-4">
<fm-map-layer-list [baseLayers]="true" [itemLayers]="baseMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list> <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
</div> </div>
</li> </li>
<li class="nav-item py-0"> <li class="nav-item py-0">
<span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Overlays</span></span> <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Overlays</span></span>
<div class="mb-4"> <div class="mb-4">
<fm-map-layer-list [itemLayers]="overlayLayers|async" [selectedLayer]="selectedOverlayLayer|async" (onDelete)="handleOnDelete($event)" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list> <fm-map-layer-list [itemLayers]="overlayLayers|async" [selectedLayer]="selectedOverlayLayer|async" (onDelete)="handleOnDelete($event)" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list>
</div> </div>
</li> </li>
<li class="nav-item py-0" *ngIf="selectedItemLayer$ | async as selectedItemLayer"> @if (selectedItemLayer$ | async; as selectedItemLayer) {
<span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Overlay slider</span><span class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></span></span> <li class="nav-item py-0">
<div class="mb-4"> <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Overlay slider</span><span class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></span></span>
<fm-map-layer-list [dataLayers]="true" [itemLayers]="[selectedItemLayer]" [selectedLayer]="selectedItemLayer" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list> <div class="mb-4">
</div> <fm-map-layer-list [dataLayers]="true" [itemLayers]="[selectedItemLayer]" [selectedLayer]="selectedItemLayer" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list>
</li> </div>
<li class="nav-item py-0"> </li>
<span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Aerial photos</span></span> }
<div class="mb-4"> <li class="nav-item py-0">
<fm-map-layer-list [baseLayers]="true" [itemLayers]="aerialMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list> <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Aerial photos</span></span>
</div> <div class="mb-4">
</li> <fm-map-layer-list [baseLayers]="true" [itemLayers]="aerialMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
</ul> </div>
</div> </li>
</div> </ul>
</div> </div>
</div>
</div>

4
projects/common-map/src/fm-map/components/legend/histogram-details/histogram-details.component.html
View File

@@ -8,8 +8,8 @@
<div class="col-8 nopadding" ><span i18n>Max</span>:</div> <div class="col-8 nopadding" ><span i18n>Max</span>:</div>
<div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.max)| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.max)| number:'1.0-2'}}</div>
<ng-container *ngIf="showConfidenceInterval()"> @if (showConfidenceInterval()) {
<div class="col-8 nopadding"><span i18n>Confidence interval</span>:</div> <div class="col-8 nopadding"><span i18n>Confidence interval</span>:</div>
<div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.confidence * 100)| number:'1.0-0'}}%</div> <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.confidence * 100)| number:'1.0-0'}}%</div>
</ng-container> }
</div> </div>

116
projects/common-map/src/fm-map/components/legend/legend.component.html
View File

@@ -1,48 +1,68 @@
<table class="container" *ngIf="showLegend()"> @if (showLegend()) {
<tr> <table class="container">
<td colspan="3"> <tr>
<div class="title"> <td colspan="3">
<h4 *ngIf="showTitle">{{layer.name}}</h4> <div class="title">
<b *ngIf="layer.unit">({{layer.unit}})</b> @if (showTitle) {
</div> <h4>{{layer.name}}</h4>
</td> }
<td> @if (layer.unit) {
<a i18n-title title="more info"><i class="fal fa-info-circle text-primary" (click)="hideHistogramDetails = !hideHistogramDetails"></i></a> <b>({{layer.unit}})</b>
</td> }
<td colspan="2"> </div>
<div class="title" *ngIf="histogramenabled"> </td>
<h4>{{histogram}}</h4> <td>
<b *ngIf="histogramunit">({{histogramunit}})</b> <a i18n-title title="more info"><i class="fal fa-info-circle text-primary" (click)="hideHistogramDetails = !hideHistogramDetails"></i></a>
</div> </td>
</td> <td colspan="2">
</tr> @if (histogramenabled) {
<tr *ngFor="let entry of layer.renderer.colorMap.entries; let i = index "> <div class="title">
<td class="legend-items"><span [style.background-color]="getAlphaHex(entry.color)" [style.border-color]="getHex(entry.color)"class="color"></span></td> <h4>{{histogram}}</h4>
<td class="legend-items-text"><span *ngIf="!entry.label">{{getScaledValue(entry.value,layer.scale) | number:'1.0-2'}} {{legendunit}}</span><span *ngIf="entry.label">{{entry.label}}</span></td> @if (histogramunit) {
<td class="histogram-items"> <b>({{histogramunit}})</b>
<div *ngIf="showHistogram()"> }
<span class="bar" [style.background-color]="getHex(entry.color)" [style.width]="getPart(layer.renderer, i)"> </div>
</span> }
<span *ngIf="getPercentage(layer.renderer,i) as percentage" class="bar-label">{{percentage | number:'1.0-2'}} %</span> </td>
</div> </tr>
</td> @for (entry of layer.renderer.colorMap.entries; track $index; let i = $index) {
</tr> <tr>
<tr *ngIf="showHistogram()"> <td class="legend-items"><span [style.background-color]="getAlphaHex(entry.color)" [style.border-color]="getHex(entry.color)"class="color"></span></td>
<td colspan="4" class="pb-1 pt-1"> <td class="legend-items-text">@if (!entry.label) {
<div class="info" [ngbCollapse]="hideHistogramDetails"> <span>{{getScaledValue(entry.value,layer.scale) | number:'1.0-2'}} {{legendunit}}</span>
<ng-container *ngIf="bandContainsStatistics(); else histogram"> }@if (entry.label) {
<fm-map-statistics-details [statistics]="layer.renderer.band.statistics" [scale]="layer.scale"></fm-map-statistics-details> <span>{{entry.label}}</span>
</ng-container> }</td>
<td class="histogram-items">
<ng-template #histogram> @if (showHistogram()) {
<fm-map-histogram-details [histogram]="layer.renderer.band.histogram" [scale]="layer.scale"></fm-map-histogram-details> <div>
</ng-template> <span class="bar" [style.background-color]="getHex(entry.color)" [style.width]="getPart(layer.renderer, i)">
</div> </span>
</td> @if (getPercentage(layer.renderer,i); as percentage) {
</tr> <span class="bar-label">{{percentage | number:'1.0-2'}} %</span>
</table> }
</div>
}
</td>
</tr>
}
@if (showHistogram()) {
<tr>
<td colspan="4" class="pb-1 pt-1">
<div class="info" [ngbCollapse]="hideHistogramDetails">
@if (bandContainsStatistics()) {
<fm-map-statistics-details [statistics]="layer.renderer.band.statistics" [scale]="layer.scale"></fm-map-statistics-details>
} @else {
<fm-map-histogram-details [histogram]="layer.renderer.band.histogram" [scale]="layer.scale"></fm-map-histogram-details>
}
</div>
</td>
</tr>
}
</table>
}

4
projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.html
View File

@@ -29,8 +29,8 @@
<div class="col-4 pull-left nopadding">{{getSquaredScaledValue(statistics.variance)| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{getSquaredScaledValue(statistics.variance)| number:'1.0-2'}}</div>
<div class="col-8 nopadding"><span i18n>Coefficient of variation</span>:</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> <div class="col-4 pull-left nopadding">{{statistics.variationCoefficient | number:'1.0-2'}}</div>
<ng-container *ngIf="statistics.confidenceIntervalLow !== undefined"> @if (statistics.confidenceIntervalLow !== undefined) {
<div class="col-8 nopadding">90% <span i18n>Confidence interval</span>:</div> <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">{{getScaledValue(statistics.confidenceIntervalLow) | number:'1.0-2'}} - {{getScaledValue(statistics.confidenceIntervalHigh) | number:'1.0-2'}}</div>
</ng-container> }
</div> </div>

204
projects/common-map/src/fm-map/components/map/map.component.html
View File

@@ -1,95 +1,109 @@
<ng-container *ngIf="{ @if ({
mapState:mapState$|async, mapState:mapState$|async,
extent:extent$|async, extent:extent$|async,
baseLayers:baseLayers$|async, baseLayers:baseLayers$|async,
overlayLayers:overlayLayers$|async, overlayLayers:overlayLayers$|async,
selectedItemLayer:selectedItemLayer$|async, selectedItemLayer:selectedItemLayer$|async,
features:features$|async, features:features$|async,
position:position$|async, position:position$|async,
parentCode:parentCode$|async, parentCode:parentCode$|async,
panelVisible:panelVisible$|async, panelVisible:panelVisible$|async,
openedModalName:openedModalName$|async, openedModalName:openedModalName$|async,
panelCollapsed:panelCollapsed$|async, panelCollapsed:panelCollapsed$|async,
panelExtraWide:panelExtraWide$|async, panelExtraWide:panelExtraWide$|async,
searchMinified:searchMinified$|async, searchMinified:searchMinified$|async,
selectedItem:selectedItem$|async, selectedItem:selectedItem$|async,
parentItem:parentItem$|async, parentItem:parentItem$|async,
queryState:queryState$|async, queryState:queryState$|async,
searchCollapsed:searchCollapsed$|async, searchCollapsed:searchCollapsed$|async,
clearEnabled:clearEnabled$|async, clearEnabled:clearEnabled$|async,
period:period$|async, period:period$|async,
compassHeading:compassHeading$|async, compassHeading:compassHeading$|async,
styles:styles$|async, styles:styles$|async,
selectedFeature:selectedFeature$|async, selectedFeature:selectedFeature$|async,
fullscreen:fullscreen$|async, fullscreen:fullscreen$|async,
showDataLayerSlide:showDataLayerSlide$|async showDataLayerSlide:showDataLayerSlide$|async,
} as state"> menuVisible:menuVisible$|async,
<aol-map #map (moveEnd)="handleOnMoveEnd($event)" (click)="handleOnMouseDown($event)" (dblClick)="handleShowLayerValues($event)" [ngClass]="{'panel-visible':state.panelVisible,'fullscreen':state.fullscreen }" class="map"> }; as state) {
<div> <aol-map #map (moveEnd)="handleOnMoveEnd($event)" (click)="handleOnMouseDown($event)" (dblClick)="handleShowLayerValues($event)" [ngClass]="{'panel-visible':state.panelVisible,'fullscreen':state.fullscreen }" class="map">
<div>
</div> </div>
<aol-view [zoom]="state.mapState.zoom" [rotation]="state.mapState.rotation">
<aol-view [zoom]="state.mapState.zoom" [rotation]="state.mapState.rotation"> <aol-coordinate [x]="state.mapState.xCenter" [y]="state.mapState.yCenter" [srid]="'EPSG:4326'"></aol-coordinate>
<aol-coordinate [x]="state.mapState.xCenter" [y]="state.mapState.yCenter" [srid]="'EPSG:4326'"></aol-coordinate> <fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent>
<fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent> </aol-view>
</aol-view> <aol-interaction-default></aol-interaction-default>
<aol-interaction-dragrotateandzoom></aol-interaction-dragrotateandzoom>
<aol-interaction-default></aol-interaction-default> <fm-map-item-layers [itemLayers]="state.baseLayers"></fm-map-item-layers>
<aol-interaction-dragrotateandzoom></aol-interaction-dragrotateandzoom> @if (!overrideOverlayLayers) {
<fm-map-item-layers [itemLayers]="state.baseLayers"></fm-map-item-layers> <fm-map-item-layers [itemLayers]="state.overlayLayers"></fm-map-item-layers>
<fm-map-item-layers *ngIf="!overrideOverlayLayers" [itemLayers]="state.overlayLayers"></fm-map-item-layers> }
<fm-map-item-layers *ngIf="!overrideSelectedItemLayer" [itemLayer]="state.selectedItemLayer" (onPrerender)="handlePrerender($event)"></fm-map-item-layers> @if (!overrideSelectedItemLayer) {
<aol-layer-vector> <fm-map-item-layers [itemLayer]="state.selectedItemLayer" (onPrerender)="handlePrerender($event)"></fm-map-item-layers>
<fm-map-item-source-vector [styles]="state.styles" [features]="state.features" (onFeatureSelected)="handleFeatureClick($event)" (onFeatureHover)="handleFeatureHover($event)" [selectedFeature]="state.selectedFeature" [selectedItem]="state.selectedItem"></fm-map-item-source-vector> }
</aol-layer-vector> <aol-layer-vector>
<router-outlet name="map-layers"></router-outlet> <fm-map-item-source-vector [styles]="state.styles" [features]="state.features" (onFeatureSelected)="handleFeatureClick($event)" (onFeatureHover)="handleFeatureHover($event)" [selectedFeature]="state.selectedFeature" [selectedItem]="state.selectedItem"></fm-map-item-source-vector>
<fm-map-gps-location [position]="state.position" [headingTolerance]="20" [showHeading]="devicesService.IsMobile()" [showTolerance]="devicesService.IsMobile()" [heading]="state.compassHeading"></fm-map-gps-location> </aol-layer-vector>
<fm-map-layer-values></fm-map-layer-values> <router-outlet name="map-layers"></router-outlet>
<div class="viewport-container" [ngStyle]="{'bottom': bottom(state.panelVisible)}"> <fm-map-gps-location [position]="state.position" [headingTolerance]="20" [showHeading]="devicesService.IsMobile()" [showTolerance]="devicesService.IsMobile()" [heading]="state.compassHeading"></fm-map-gps-location>
<div class="control-container"> <fm-map-layer-values></fm-map-layer-values>
<router-outlet name="map-controls"></router-outlet> <div class="viewport-container" [ngStyle]="{'bottom': bottom(state.panelVisible)}">
<fm-map-layer-switcher></fm-map-layer-switcher> <div class="control-container">
<fm-map-pan-to-location [position]="state.position" [mapState]="state.mapState" [animate]="true"></fm-map-pan-to-location> <router-outlet name="map-controls"></router-outlet>
<fm-map-rotation-reset></fm-map-rotation-reset> <fm-map-layer-switcher></fm-map-layer-switcher>
</div> <fm-map-pan-to-location [position]="state.position" [mapState]="state.mapState" [animate]="true"></fm-map-pan-to-location>
<div class="slide-container" [ngClass]="{'showDataLayerSlide':state.showDataLayerSlide}"> <fm-map-rotation-reset></fm-map-rotation-reset>
<form> </div>
<input class="dataLayerSlide" (input)="handleSlideChange($event)" type="range" style="width: 100%" value="{{dataLayerSlideValue}}"/> <div class="slide-container" [ngClass]="{'showDataLayerSlide':state.showDataLayerSlide}">
</form> <form>
</div> <input class="dataLayerSlide" (input)="handleSlideChange($event)" type="range" style="width: 100%" value="{{dataLayerSlideValue}}"/>
</div> </form>
<fm-map-file-drop-target [parentCode]="state.parentCode" (onFileDropped)="handleFileDropped($event)"></fm-map-file-drop-target> </div>
</div>
<div *ngIf="noContent"> <fm-map-file-drop-target [parentCode]="state.parentCode" (onFileDropped)="handleFileDropped($event)"></fm-map-file-drop-target>
<fm-map-map-search #mapSearch [openedModalName]="state.openedModalName" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':state.menuVisible}" (onToggleMenu)="handleToggleMenu($event)" (onSearchCollapse)="handleSearchCollapse($event)" (onSearchExpand)="handleSearchExpand($event)" [collapsed]="state.searchCollapsed" [searchMinified]="state.searchMinified" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch($event)" [filterOptions]="state.queryState" [clearEnabled]="state.clearEnabled" [period]="state.period" (onPeriodChange)="handlePeriodChange($event)" (onCitySearch)="handleCitySearch($event)"></fm-map-map-search> @if (noContent) {
</div> <div>
<div class="side-panel-container"> <fm-map-map-search #mapSearch [openedModalName]="state.openedModalName" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':state.menuVisible}" (onToggleMenu)="handleToggleMenu($event)" (onSearchCollapse)="handleSearchCollapse($event)" (onSearchExpand)="handleSearchExpand($event)" [collapsed]="state.searchCollapsed" [searchMinified]="state.searchMinified" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch($event)" [filterOptions]="state.queryState" [clearEnabled]="state.clearEnabled" [period]="state.period" (onPeriodChange)="handlePeriodChange($event)" (onCitySearch)="handleCitySearch($event)"></fm-map-map-search>
</div>
<fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false" [extrawide]="state.panelExtraWide"> }
<div class="panel-wrapper" *ngIf="noContent"> <div class="side-panel-container">
<div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)"> <fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false" [extrawide]="state.panelExtraWide">
</div> @if (noContent) {
<div class="panel-bottom"> <div class="panel-wrapper">
@if (!(state.searchMinified)) {
<div *ngIf="!(state.selectedItem)"> <div class="panel-top bg-secondary">
<fm-map-feature-list-container [features]="state.features" [selectedFeature]="state.selectedFeature" [queryState]="state.queryState" [clickedFeature]="clickedFeature"></fm-map-feature-list-container> </div>
</div> }
<div class="panel-bottom">
<div *ngIf="state.selectedItem;let item"> @if (!(state.selectedItem)) {
<fm-map-selected-item-container [item]="item" [parentItem]="state.parentItem" [itemLayer]="state.selectedItemLayer" [overlayLayers]="state.overlayLayers"></fm-map-selected-item-container> <div>
</div> <fm-map-feature-list-container [features]="state.features" [selectedFeature]="state.selectedFeature" [queryState]="state.queryState" [clickedFeature]="clickedFeature"></fm-map-feature-list-container>
<div *ngIf="state.features.length == 0" class="no-results m-2"> </div>
<div *ngIf="state.queryState.query">Cannot find <span>{{state.queryState?.query}}</span></div> }
<div *ngIf="state.queryState?.tags">Cannot find tag <span>{{state.queryState?.tags}}</span></div> @if (state.selectedItem; as item) {
</div> <div>
</div> <fm-map-selected-item-container [item]="item" [parentItem]="state.parentItem" [itemLayer]="state.selectedItemLayer" [overlayLayers]="state.overlayLayers"></fm-map-selected-item-container>
</div> </div>
</fm-side-panel> }
<fm-side-panel [resizeable]="true" [visible]="!noContent" [extrawide]="state.panelExtraWide"> @if (state.features.length == 0) {
<router-outlet (activate)="handleSidepaneloutletActivate($event)" (deactivate)="handleSidepaneloutletDeactivate($event)"></router-outlet> <div class="no-results m-2">
</fm-side-panel> @if (state.queryState.query) {
</div> <div>Cannot find <span>{{state.queryState?.query}}</span></div>
</aol-map> }
</ng-container> @if (state.queryState?.tags) {
<div>Cannot find tag <span>{{state.queryState?.tags}}</span></div>
}
</div>
}
</div>
</div>
}
</fm-side-panel>
<fm-side-panel [resizeable]="true" [visible]="!noContent" [extrawide]="state.panelExtraWide">
<router-outlet (activate)="handleSidepaneloutletActivate($event)" (deactivate)="handleSidepaneloutletDeactivate($event)"></router-outlet>
</fm-side-panel>
</div>
</aol-map>
}

34
projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.html
View File

@@ -1,19 +1,23 @@
<div class="spacer"></div> <div class="spacer"></div>
<div *ngIf="item;let item"> @if (item; as item) {
<div class="card border-0"> <div>
<div class="card-body"> <div class="card border-0">
<fm-back-button></fm-back-button> <div class="card-body">
<div class="card menu-card"> <fm-back-button></fm-back-button>
<h1>Cropfield</h1> <div class="card menu-card">
<h4>{{item.name}}</h4> <h1>Cropfield</h1>
<div class="card-text"><span>{{areaInHa(item)| number:'1.2-2'}} ha</span>&nbsp;<span>{{item.data.cropTypeName}}</span></div> <h4>{{item.name}}</h4>
<div class="card-text"><span>{{item.data.startDate|date}}</span> - <span>{{item.data.endDate|date}}</span> </div> <div class="card-text"><span>{{areaInHa(item)| number:'1.2-2'}} ha</span>&nbsp;<span>{{item.data.cropTypeName}}</span></div>
<ul class="p-0 mt-2"> <div class="card-text"><span>{{item.data.startDate|date}}</span> - <span>{{item.data.endDate|date}}</span> </div>
<li *ngIf="item.isEditable"><a href="#" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li> <ul class="p-0 mt-2">
</ul> @if (item.isEditable) {
<li><a href="#" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
}
</ul>
</div>
</div> </div>
<fm-map-item-list [items]="(items|async)"></fm-map-item-list>
<fm-map-item-widget-list [item]="item"></fm-map-item-widget-list>
</div> </div>
<fm-map-item-list [items]="(items|async)"></fm-map-item-list>
<fm-map-item-widget-list [item]="item"></fm-map-item-widget-list>
</div> </div>
</div> }

88
projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html
View File

@@ -1,37 +1,51 @@
<div class="spacer"></div> <div class="spacer"></div>
<div *ngIf="item;let item"> @if (item; as item) {
<div class="card border-0"> <div>
<div class="card-body"> <div class="card border-0">
<fm-back-button></fm-back-button> <div class="card-body">
<div class="card menu-card"> <fm-back-button></fm-back-button>
<h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2> <div class="card menu-card">
<h1>{{item.name}}</h1> @if (parentOfItemType('vnd.farmmaps.itemtype.cropfield')) {
</div> <h2>{{parentItem.name}}</h2>
<ng-container *ngIf="item?.data.layers;let layers"> }
<div class="legend-container"> <h1>{{item.name}}</h1>
<div class="card menu-card"> </div>
<div *ngIf="layers.length>1"> @if (item?.data.layers; as layers) {
<select (change)="onLayerChanged($event.target.value)"> <div class="legend-container">
<option *ngFor="let l of layers;" [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option> <div class="card menu-card">
</select> @if (layers.length>1) {
</div> <div>
<fm-map-layer-legend [showTitle]="layers.length == 1" <select (change)="onLayerChanged($event.target.value)">
[layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend> @for (l of layers; track l.index) {
</div> <option [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
</div> }
<div class="card menu-card"> </select>
<ul class="p-0 mt-2"> </div>
<li *ngIf="item.isEditable"><a href="#" class="ms-1 me-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li> }
<ng-container *ngIf="itemTypeService.isLayer(item)"> <fm-map-layer-legend [showTitle]="layers.length == 1"
<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>&nbsp;<span i18n>Add as overlay</span></a></li> [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
<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>&nbsp;<span i18n>Remove overlay</span></a></li> </div>
</ng-container> </div>
<li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li> <div class="card menu-card">
<li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li> <ul class="p-0 mt-2">
</ul> @if (item.isEditable) {
</div> <li><a href="#" class="ms-1 me-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
<fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert> }
</ng-container> @if (itemTypeService.isLayer(item)) {
</div> @if (!getItemLayer(item,itemLayer.layerIndex)) {
</div> <li><a href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
</div> }
@if (getItemLayer(item,itemLayer.layerIndex)) {
<li><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
}
}
<li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li>
<li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
</ul>
</div>
<fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
}
</div>
</div>
</div>
}

74
projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html
View File

@@ -1,35 +1,49 @@
<div class="spacer"></div> <div class="spacer"></div>
<div *ngIf="item;let item"> @if (item; as item) {
<div class="card border-0"> <div>
<div class="card-body"> <div class="card border-0">
<fm-back-button></fm-back-button> <div class="card-body">
<div class="card menu-card"> <fm-back-button></fm-back-button>
<h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
<h1>{{item.name}}</h1>
</div>
<ng-container *ngIf="item?.data.layers;let layers">
<div class="legend-container">
<div class="card menu-card">
<div *ngIf="layers.length>1">
<select (change)="onLayerChanged($event.target.value)">
<option *ngFor="let l of layers;" [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
</select>
</div>
<fm-map-layer-legend [showTitle]="layers.length==1" [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
</div>
</div>
<div class="card menu-card"> <div class="card menu-card">
<ul class="p-0 mt-2"> @if (parentOfItemType('vnd.farmmaps.itemtype.cropfield')) {
<li *ngIf="item.isEditable"><a href="#" class="mt-1 me-1" (click)="handleOnEdit(item)" ><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li> <h2>{{parentItem.name}}</h2>
<ng-container *ngIf="itemTypeService.isLayer(item)"> }
<li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-olus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li> <h1>{{item.name}}</h1>
<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>&nbsp;<span i18n>Remove overlay</span></a></li>
</ng-container>
<li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
</ul>
</div> </div>
</ng-container> @if (item?.data.layers; as layers) {
<fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert> <div class="legend-container">
<div class="card menu-card">
@if (layers.length>1) {
<div>
<select (change)="onLayerChanged($event.target.value)">
@for (l of layers; track l.index) {
<option [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
}
</select>
</div>
}
<fm-map-layer-legend [showTitle]="layers.length==1" [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
</div>
</div>
<div class="card menu-card">
<ul class="p-0 mt-2">
@if (item.isEditable) {
<li><a href="#" class="mt-1 me-1" (click)="handleOnEdit(item)" ><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
}
@if (itemTypeService.isLayer(item)) {
@if (!getItemLayer(item,itemLayer.layerIndex)) {
<li><a href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-olus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
}
@if (getItemLayer(item,itemLayer.layerIndex)) {
<li><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
}
}
<li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
</ul>
</div>
}
<fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
</div>
</div> </div>
</div> </div>
</div> }

122
projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
View File

@@ -1,52 +1,70 @@
<div class="spacer"></div> <div class="spacer"></div>
<div *ngIf="selectedItem();let item"> @if (selectedItem(); as item) {
<div class="card border-0"> <div>
<div class="card-body"> <div class="card border-0">
<fm-back-button></fm-back-button> <div class="card-body">
<div class="card menu-card"> <fm-back-button></fm-back-button>
<h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2> <div class="card menu-card">
<h1>{{item.name}}</h1> @if (parentOfItemType('vnd.farmmaps.itemtype.cropfield')) {
</div> <h2>{{parentItem.name}}</h2>
<ng-container *ngIf="item?.data.layers;let layers"> }
<div class="legend-container"> <h1>{{item.name}}</h1>
<div class="card menu-card"> </div>
<h5><span i18n>Date</span>: {{temporalService.selectedDate(itemLayer)}}</h5> @if (item?.data.layers; as layers) {
<div class="d-flex justify-content-between"> <div class="legend-container">
<div> <div class="card menu-card">
<button *ngIf="temporalService.hasPrevious(itemLayer)" type="button" class="btn btn-link p-0" (click)="handlePreviousTemporal($event)"> <h5><span i18n>Date</span>: {{temporalService.selectedDate(itemLayer)}}</h5>
<i class="fal fa-arrow-circle-left" aria-hidden="true" i18n-title title="Previous"></i>&nbsp;{{ temporalService.previousDate(itemLayer) }} <div class="d-flex justify-content-between">
</button> <div>
</div> @if (temporalService.hasPrevious(itemLayer)) {
<div> <button type="button" class="btn btn-link p-0" (click)="handlePreviousTemporal($event)">
<button *ngIf="temporalService.hasNext(itemLayer)" type="button" class="btn btn-link p-0" (click)="handleNextTemporal($event)"> <i class="fal fa-arrow-circle-left" aria-hidden="true" i18n-title title="Previous"></i>&nbsp;{{ temporalService.previousDate(itemLayer) }}
{{ temporalService.nextDate(itemLayer)}}&nbsp;<i class="fal fa-arrow-circle-right" aria-hidden="true" i18n-title title="Next"></i> </button>
</button> }
</div> </div>
</div> <div>
<fm-map-zoom-to-show-alert [layer]="currentItemLayer()?.layer"></fm-map-zoom-to-show-alert> @if (temporalService.hasNext(itemLayer)) {
</div> <button type="button" class="btn btn-link p-0" (click)="handleNextTemporal($event)">
<div class="card menu-card pt-2"> {{ temporalService.nextDate(itemLayer)}}&nbsp;<i class="fal fa-arrow-circle-right" aria-hidden="true" i18n-title title="Next"></i>
<div *ngIf="layers.length>1"> </button>
<select (change)="onLayerChanged($event.target.value)"> }
<option *ngFor="let l of layers;" [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option> </div>
</select> </div>
</div> <fm-map-zoom-to-show-alert [layer]="currentItemLayer()?.layer"></fm-map-zoom-to-show-alert>
<fm-map-layer-legend [showTitle]="layers.length == 1" </div>
[layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend> <div class="card menu-card pt-2">
</div> @if (layers.length>1) {
</div> <div>
<div class="card menu-card"> <select (change)="onLayerChanged($event.target.value)">
<ul class="p-0 mt-2"> @for (l of layers; track l.index) {
<li *ngIf="item.isEditable"><a href="#" class="mt-1 me-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li> <option [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
<ng-container *ngIf="itemTypeService.isLayer(item)"> }
<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>&nbsp;<span i18n>Add as overlay</span></a></li> </select>
<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>&nbsp;<span i18n>Remove overlay</span></a></li> </div>
</ng-container> }
<li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i>&nbsp;<span i18n>Show chart</span></a></li> <fm-map-layer-legend [showTitle]="layers.length == 1"
<li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li> [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
</ul> </div>
</div> </div>
</ng-container> <div class="card menu-card">
</div> <ul class="p-0 mt-2">
</div> @if (item.isEditable) {
</div> <li><a href="#" class="mt-1 me-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
}
@if (itemTypeService.isLayer(item)) {
@if (!getItemLayer(item,itemLayer.layerIndex)) {
<li><a href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
}
@if (getItemLayer(item,itemLayer.layerIndex)) {
<li><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
}
}
<li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i>&nbsp;<span i18n>Show chart</span></a></li>
<li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
</ul>
</div>
}
</div>
</div>
</div>
}

52
projects/common-map/src/fm-map/components/selected-item/selected-item.component.html
View File

@@ -1,21 +1,31 @@
<div *ngIf="item;let item"> @if (item; as item) {
<div class="card border-0"> <div>
<fm-thumbnail [item]="item" [edit]="item.isEditable"></fm-thumbnail> <div class="card border-0">
</div> <fm-thumbnail [item]="item" [edit]="item.isEditable"></fm-thumbnail>
<div class="card"> </div>
<div class="card-body"> <div class="card">
<fm-back-button></fm-back-button> <div class="card-body">
<h1 class="card-title">{{item.name}}</h1> <fm-back-button></fm-back-button>
<div class="card menu-card"> <h1 class="card-title">{{item.name}}</h1>
<ul class="p-0 mt-2"> <div class="card menu-card">
<li *ngIf="itemTypeService.hasViewer(item)"><a href="#" (click)="handleOnView(item)" class="btn btn-outline-secondary"><i class="fal fa-eye" aria-hidden="true" title="View"></i>&nbsp;<span i18n>View</span></a></li> <ul class="p-0 mt-2">
<li *ngIf="item.isEditable"><a href="#" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" title="Edit"></i> <span i18n>Edit</span></a></li> @if (itemTypeService.hasViewer(item)) {
<ng-container *ngIf="itemTypeService.isLayer(item)"> <li><a href="#" (click)="handleOnView(item)" class="btn btn-outline-secondary"><i class="fal fa-eye" aria-hidden="true" title="View"></i>&nbsp;<span i18n>View</span></a></li>
<li *ngIf="!getItemLayer(item)"><a href="#" (click)="handleAddAsLayer(item)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li> }
<li *ngIf="getItemLayer(item)"><a href="#" (click)="handleRemoveLayer(item)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li> @if (item.isEditable) {
</ng-container> <li><a href="#" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" title="Edit"></i> <span i18n>Edit</span></a></li>
</ul> }
</div> @if (itemTypeService.isLayer(item)) {
</div> @if (!getItemLayer(item)) {
</div> <li><a href="#" (click)="handleAddAsLayer(item)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
</div> }
@if (getItemLayer(item)) {
<li ><a href="#" (click)="handleRemoveLayer(item)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
}
}
</ul>
</div>
</div>
</div>
</div>
}

22
projects/common-map/src/fm-map/components/widget-status/widget-status.component.html
View File

@@ -1,6 +1,16 @@
<div [ngSwitch]="stage"> <div>
<h6 *ngSwitchCase="StageEnum.DevelopmentPreAlpha" style="color:darkred" [ngbTooltip]="info"><b><span i18n>Stage:Pre-alpha</span></b></h6> @switch (stage) {
<h6 *ngSwitchCase="StageEnum.DevelopmentAlpha" style="color:red" [ngbTooltip]="info"><b><span i18n>Stage:Alpha</span></b></h6> @case (StageEnum.DevelopmentPreAlpha) {
<h6 *ngSwitchCase="StageEnum.DevelopmentBeta" style="color:orange" [ngbTooltip]="info" ><b><span i18n>Stage:Beta</span></b></h6> <h6 style="color:darkred" [ngbTooltip]="info"><b><span i18n>Stage:Pre-alpha</span></b></h6>
<h6 *ngSwitchCase="StageEnum.ReleaseCandidate" style="color:green" [ngbTooltip]="info" ><b><span i18n>Stage:RC</span></b></h6> }
</div> @case (StageEnum.DevelopmentAlpha) {
<h6 style="color:red" [ngbTooltip]="info"><b><span i18n>Stage:Alpha</span></b></h6>
}
@case (StageEnum.DevelopmentBeta) {
<h6 style="color:orange" [ngbTooltip]="info" ><b><span i18n>Stage:Beta</span></b></h6>
}
@case (StageEnum.ReleaseCandidate) {
<h6 style="color:green" [ngbTooltip]="info" ><b><span i18n>Stage:RC</span></b></h6>
}
}
</div>

18
projects/common-map/src/test.ts
View File

@@ -1,18 +0,0 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'core-js/es7/reflect';
import 'zone.js';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
);

11
projects/common-map/tsconfig.lib.json
View File

@@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "bundler",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -12,15 +12,9 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*"
"node_modules/@angular/*"
] ]
} }
}, },
@@ -33,7 +27,6 @@
"compilationMode": "partial" "compilationMode": "partial"
}, },
"exclude": [ "exclude": [
"src/test.ts",
"**/*.spec.ts" "**/*.spec.ts"
] ]
} }

11
projects/common-map/tsconfig.lib.prod.json
View File

@@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "bundler",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -12,15 +12,9 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*"
"node_modules/@angular/*"
] ]
} }
}, },
@@ -33,7 +27,6 @@
"compilationMode": "partial" "compilationMode": "partial"
}, },
"exclude": [ "exclude": [
"src/test.ts",
"**/*.spec.ts" "**/*.spec.ts"
] ]
} }

2
projects/common-map/tsconfig.spec.json
View File

@@ -3,12 +3,10 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/spec", "outDir": "../../out-tsc/spec",
"types": [ "types": [
"jasmine",
"node" "node"
] ]
}, },
"files": [ "files": [
"src/test.ts"
], ],
"include": [ "include": [
"**/*.spec.ts", "**/*.spec.ts",

32
projects/common-map3d/karma.conf.js
View File

@@ -1,32 +0,0 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma')
],
client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, '../../coverage/common-map3d'),
reports: ['html', 'lcovonly', 'text-summary'],
fixWebpackSourcePaths: true
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false,
restartOnFileChange: true
});
};

48
projects/common-map3d/package-lock.json generated
View File

@@ -11,8 +11,8 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "^18.2.3", "@angular/common": "20.3.16",
"@angular/core": "^18.2.3", "@angular/core": "20.3.16",
"cesium": "^1.97.0", "cesium": "^1.97.0",
"ol-cesium": ">=2.13.0" "ol-cesium": ">=2.13.0"
} }
@@ -34,35 +34,46 @@
"extraneous": true "extraneous": true
}, },
"node_modules/@angular/common": { "node_modules/@angular/common": {
"version": "18.2.3", "version": "20.3.16",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.3.tgz", "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.16.tgz",
"integrity": "sha512-NFL4yXXImSCH7i1xnHykUjHa9vl9827fGiwSV2mnf7LjSUsyDzFD8/54dNuYN9OY8AUD+PnK0YdNro6cczVyIA==", "integrity": "sha512-GRAziNlntwdnJy3F+8zCOvDdy7id0gITjDnM6P9+n2lXvtDuBLGJKU3DWBbvxcCjtD6JK/g/rEX5fbCxbUHkQQ==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^18.19.1 || ^20.11.1 || >=22.0.0" "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "18.2.3", "@angular/core": "20.3.16",
"rxjs": "^6.5.3 || ^7.4.0" "rxjs": "^6.5.3 || ^7.4.0"
} }
}, },
"node_modules/@angular/core": { "node_modules/@angular/core": {
"version": "18.2.3", "version": "20.3.16",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.3.tgz", "resolved": "https://registry.npmjs.org/@angular/core/-/core-20.3.16.tgz",
"integrity": "sha512-VGhMJxj7d0rYpqVfQrcGRB7EE/BCziotft/I/YPl6bOMPSAvMukG7DXQuJdYpNrr62ks78mlzHlZX/cdmB9Prw==", "integrity": "sha512-KSFPKvOmWWLCJBbEO+CuRUXfecX2FRuO0jNi9c54ptXMOPHlK1lIojUnyXmMNzjdHgRug8ci9qDuftvC2B7MKg==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^18.19.1 || ^20.11.1 || >=22.0.0" "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/compiler": "20.3.16",
"rxjs": "^6.5.3 || ^7.4.0", "rxjs": "^6.5.3 || ^7.4.0",
"zone.js": "~0.14.10" "zone.js": "~0.15.0"
},
"peerDependenciesMeta": {
"@angular/compiler": {
"optional": true
},
"zone.js": {
"optional": true
}
} }
}, },
"node_modules/@cesium/engine": { "node_modules/@cesium/engine": {
@@ -498,9 +509,10 @@
} }
}, },
"node_modules/rxjs": { "node_modules/rxjs": {
"version": "7.8.1", "version": "7.8.2",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
"license": "Apache-2.0",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.1.0" "tslib": "^2.1.0"
@@ -549,12 +561,6 @@
"integrity": "sha512-Dn6vJ1Z9v1tepSjvnCpwk5QqwIPcEFKdgnjqfYOABv1ngSofuAhtlugcUC3ehS1OHdgDWSG6C5mvj+Qm15udTQ==", "integrity": "sha512-Dn6vJ1Z9v1tepSjvnCpwk5QqwIPcEFKdgnjqfYOABv1ngSofuAhtlugcUC3ehS1OHdgDWSG6C5mvj+Qm15udTQ==",
"peer": true "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": { "node_modules/zstddec": {
"version": "0.1.0", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.1.0.tgz", "resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.1.0.tgz",

4
projects/common-map3d/package.json
View File

@@ -8,8 +8,8 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "19.2.18", "@angular/common": "^21.1.0",
"@angular/core": "19.2.18", "@angular/core": "^21.1.0",
"cesium": "^1.97.0", "cesium": "^1.97.0",
"ol-cesium": ">=2.13.0" "ol-cesium": ">=2.13.0"
} }

17
projects/common-map3d/src/test.ts
View File

@@ -1,17 +0,0 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
);

11
projects/common-map3d/tsconfig.lib.json
View File

@@ -4,7 +4,7 @@
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2015", "target": "es2015",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "bundler",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -13,15 +13,9 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*"
"node_modules/@angular/*"
] ]
} }
}, },
@@ -34,7 +28,6 @@
"compilationMode": "partial" "compilationMode": "partial"
}, },
"exclude": [ "exclude": [
"src/test.ts",
"**/*.spec.ts" "**/*.spec.ts"
] ]
} }

11
projects/common-map3d/tsconfig.lib.prod.json
View File

@@ -4,7 +4,7 @@
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2015", "target": "es2015",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "bundler",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -13,15 +13,9 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*"
"node_modules/@angular/*"
] ]
} }
}, },
@@ -34,7 +28,6 @@
"compilationMode": "partial" "compilationMode": "partial"
}, },
"exclude": [ "exclude": [
"src/test.ts",
"**/*.spec.ts" "**/*.spec.ts"
] ]
} }

2
projects/common-map3d/tsconfig.spec.json
View File

@@ -3,12 +3,10 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/spec", "outDir": "../../out-tsc/spec",
"types": [ "types": [
"jasmine",
"node" "node"
] ]
}, },
"files": [ "files": [
"src/test.ts"
], ],
"include": [ "include": [
"**/*.spec.ts", "**/*.spec.ts",

32
projects/common/karma.conf.js
View File

@@ -1,32 +0,0 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma')
],
client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, '../../coverage/common'),
reports: ['html', 'lcovonly'],
fixWebpackSourcePaths: true
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false,
restartOnFileChange: true
});
};

3141
projects/common/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

22
projects/common/package.json
View File

@@ -5,20 +5,20 @@
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/" "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
}, },
"peerDependencies": { "peerDependencies": {
"@ng-bootstrap/ng-bootstrap": "^18.0.0", "@ng-bootstrap/ng-bootstrap": "^20.0.0",
"@angular/common": "19.2.18", "@angular/common": "^21.1.0",
"@angular/core": "19.2.18", "@angular/core": "^21.1.0",
"@angular/forms": "19.2.18", "@angular/forms": "^21.1.0",
"@ngrx/effects": "19.2.1", "@ngrx/effects": "^21.0.1",
"@ngrx/router-store": "19.2.1", "@ngrx/router-store": "^21.0.1",
"@ngrx/store": "19.2.1", "@ngrx/store": "^21.0.1",
"tassign": "^1.0.0", "tassign": "^1.0.0",
"bootstrap": "^5.3.3", "bootstrap": "^5.3.3",
"@microsoft/signalr": "^3.1.16", "@microsoft/signalr": "^10.0.0",
"ngx-uploadx": "7.0.1", "ngx-uploadx": "^7.0.1",
"angular-oauth2-oidc": "^17.0.2", "angular-oauth2-oidc": "^20.0.2",
"moment": "^2.29.4", "moment": "^2.29.4",
"ngx-avatars": "1.9.3", "ngx-avatars": "^1.10.1",
"ngx-image-cropper": "^7.0.0", "ngx-image-cropper": "^7.0.0",
"ngx-clipboard": "^16.0.0" "ngx-clipboard": "^16.0.0"
} }

16
projects/common/src/fm/common-service.module.ts
View File

@@ -38,7 +38,10 @@ import { PackageService } from './services/package.service';
import { PackagePreloadStrategy } from './services/package-preload-strategy.service'; import { PackagePreloadStrategy } from './services/package-preload-strategy.service';
import { SenmlService } from './services/senml-service'; import { SenmlService } from './services/senml-service';
import { DeviceService } from './services/device.service'; import { DeviceService } from './services/device.service';
import { GradientService} from './services/gradient.service'; import { GradientService } from './services/gradient.service';
import { UserDataService } from './services/user-data.service';
import { CacheService } from './services/cache-service';
import { SharedItemService } from './services/shared.item.service';
export { export {
FolderService, FolderService,
@@ -69,7 +72,10 @@ export {
SenmlService, SenmlService,
PackagePreloadStrategy, PackagePreloadStrategy,
DeviceService, DeviceService,
GradientService GradientService,
UserDataService,
CacheService,
SharedItemService
}; };
@NgModule({ @NgModule({
@@ -90,9 +96,9 @@ export class AppCommonServiceModule {
providers: [ providers: [
AppConfig, AppConfig,
ItemTypeService, ItemTypeService,
provideAppInitializer(() => { provideAppInitializer(() => {
const initializerFn = (appConfigFactory)(inject(Injector), inject(AppConfig), inject(OAuthService), inject(AuthConfigFactory), inject(OAuthStorage), inject(ItemTypeService)); const initializerFn = (appConfigFactory)(inject(Injector), inject(AppConfig), inject(OAuthService), inject(AuthConfigFactory), inject(OAuthStorage), inject(ItemTypeService));
return initializerFn(); return initializerFn();
}), }),
{ {
provide: HTTP_INTERCEPTORS, provide: HTTP_INTERCEPTORS,

4
projects/common/src/fm/common.module.ts
View File

@@ -61,6 +61,9 @@ import { IItemTask, ItemTask } from './models/itemTask';
import { IJsonline } from './models/json-line'; import { IJsonline } from './models/json-line';
import { IListItem } from './models/list.item'; import { IListItem } from './models/list.item';
import { IPackage, IPackages } from './models/package'; import { IPackage, IPackages } from './models/package';
import { IAclRights } from './models/acl.rights';
import { IListItemAclRights } from './models/list.item.acl.rights';
import { ISharedItem } from './models/shared.item';
import { IQueryState } from './models/query.state'; import { IQueryState } from './models/query.state';
import { ISenMLItem } from './models/senml-item'; import { ISenMLItem } from './models/senml-item';
import { ITypeaheadItem } from './models/typeahead.item'; import { ITypeaheadItem } from './models/typeahead.item';
@@ -79,6 +82,7 @@ export {
commonReducers, EditImageModalComponent, commonReducers, EditImageModalComponent,
GradientComponent, GradientComponent,
GradientSelectComponent, HasClaimDirective, HasPackageDirective, HasRoleDirective, IAuthconfigFactory, IColor, IDataLayer, IEventMessage, IGradientstop, IItem, IItemLinkType, IItemTask, IItemType, IItemTypes, IJsonline, IListItem, IPackage, GradientSelectComponent, HasClaimDirective, HasPackageDirective, HasRoleDirective, IAuthconfigFactory, IColor, IDataLayer, IEventMessage, IGradientstop, IItem, IItemLinkType, IItemTask, IItemType, IItemTypes, IJsonline, IListItem, IPackage,
IAclRights, IListItemAclRights, ISharedItem,
IPackages, IQueryState, ISenMLItem, Item, ItemLinkComponent, ItemTask, ITypeaheadItem, IUrlType, IUser, MenuBackgroundComponent, NotFoundComponent, IPackages, IQueryState, ISenMLItem, Item, ItemLinkComponent, ItemTask, ITypeaheadItem, IUrlType, IUser, MenuBackgroundComponent, NotFoundComponent,
NotImplementedComponent, PackageExistsDirective, ResumableFileUploadComponent, SafePipe, SecureOAuthStorage, SessionClearedComponent, SidePanelComponent, TagInputComponent, ThumbnailComponent, TimespanComponent, UserMenuComponent, WeatherCurrentObservation NotImplementedComponent, PackageExistsDirective, ResumableFileUploadComponent, SafePipe, SecureOAuthStorage, SessionClearedComponent, SidePanelComponent, TagInputComponent, ThumbnailComponent, TimespanComponent, UserMenuComponent, WeatherCurrentObservation
}; };

98
projects/common/src/fm/components/app/app.component.html
View File

@@ -1,47 +1,51 @@
<div class="app fullscreen" (click)="handleClick($event)" [ngClass]="{'fullscreen' :(fullScreen|async),'pagemode':(isPageMode|async),'appmode':!(isPageMode|async)}"> <div class="app fullscreen" (click)="handleClick($event)" [ngClass]="{'fullscreen' :(fullScreen|async),'pagemode':(isPageMode|async),'appmode':!(isPageMode|async)}">
<nav class="navbar navbar-light navbar-expand bg-light navigation-clean"> <nav class="navbar navbar-light navbar-expand bg-light navigation-clean">
<div class="container-fluid p-3 justify-content-start"> <div class="container-fluid p-3 justify-content-start">
<div class="header-logo pageonly"><router-outlet name="header-logo"></router-outlet></div> <div class="header-logo pageonly"><router-outlet name="header-logo"></router-outlet></div>
<button type="button" class="btn btn-outline-secondary apponly" (click)="handleToggleMenu($event)"><i class="fal fa-bars" aria-hidden="true"></i></button> <button type="button" class="btn btn-outline-secondary apponly" (click)="handleToggleMenu($event)"><i class="fal fa-bars" aria-hidden="true"></i></button>
<router-outlet name="menu" class="ms-4"></router-outlet> <router-outlet name="menu" class="ms-4"></router-outlet>
<div class="collapse navbar-collapse pageonly"> <div class="collapse navbar-collapse pageonly">
<a class="btn btn-primary ms-auto" role="button" [routerLink]="[ startPage == null?'/map':startPage]"> <a class="btn btn-primary ms-auto" role="button" [routerLink]="[ startPage == null?'/map':startPage]">
<span *ngIf="(user|async)==null" i18n>Sign in</span> @if ((user|async)==null) {
<span *ngIf="(user|async)!=null" i18n>To app</span> <span i18n>Sign in</span>
</a> }
</div> @if ((user|async)!=null) {
</div> <span i18n>To app</span>
</nav> }
<div class="body"> </a>
<router-outlet></router-outlet> </div>
</div> </div>
<fm-menu-background [visible]="menuVisible|async"></fm-menu-background> </nav>
<fm-side-panel [visible]="menuVisible|async" [left]="true" class="menu" (click)="handleStopBubble($event)"> <div class="body">
<div class="container-fluid"> <router-outlet></router-outlet>
<div class="body"> </div>
<div class="d-flex flex-row"> <fm-menu-background [visible]="menuVisible|async"></fm-menu-background>
<div class="mt-2 mb-2 flex-grow-1 logo" (click)="handleHome($event)"><router-outlet name="side-panel-logo"></router-outlet></div> <fm-side-panel [visible]="menuVisible|async" [left]="true" class="menu" (click)="handleStopBubble($event)">
<div class="mt-2 mb-2 ms-2"><button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fal fa-times" aria-hidden="true"></i></button></div> <div class="container-fluid">
</div> <div class="body">
<div class="d-flex flex-column cards"> <div class="d-flex flex-row">
<router-outlet name="side-panel-menu"></router-outlet> <div class="mt-2 mb-2 flex-grow-1 logo" (click)="handleHome($event)"><router-outlet name="side-panel-logo"></router-outlet></div>
</div> <div class="mt-2 mb-2 ms-2"><button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fal fa-times" aria-hidden="true"></i></button></div>
</div> </div>
</div> <div class="d-flex flex-column cards">
</fm-side-panel> <router-outlet name="side-panel-menu"></router-outlet>
<ng-container *ngIf="showUploadProgress"> </div>
<fm-resumable-file-upload></fm-resumable-file-upload> </div>
</ng-container> </div>
<div class="user-menu apponly"> </fm-side-panel>
<fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async" [backgroundColor]="settingMenuBackgroundColor|async"></fm-setting-menu> @if (showUploadProgress) {
<fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu> <fm-resumable-file-upload></fm-resumable-file-upload>
<fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu> }
<fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu> <div class="user-menu apponly">
<fm-user-menu [user]="user|async" [showMenu]="accountMenuVisible|async"></fm-user-menu> <fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async" [backgroundColor]="settingMenuBackgroundColor|async"></fm-setting-menu>
</div> <fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
<div class="healthstatus-container online apponly" [ngClass]="{'online' :(isOnline|async)}"> <fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
<div class="healthstatus alert alert-danger m-0" > <fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>
<span i18n>Not connected, make sure your device has an active internet connection</span> <fm-user-menu [user]="user|async" [showMenu]="accountMenuVisible|async"></fm-user-menu>
</div> </div>
</div> <div class="healthstatus-container online apponly" [ngClass]="{'online' :(isOnline|async)}">
</div> <div class="healthstatus alert alert-danger m-0" >
<span i18n>Not connected, make sure your device has an active internet connection</span>
</div>
</div>
</div>

4
projects/common/src/fm/components/app/app.component.ts
View File

@@ -1,6 +1,6 @@
import { Component, OnInit, OnDestroy, Inject, Optional, ViewEncapsulation, RendererFactory2, PLATFORM_ID, ChangeDetectionStrategy, HostListener, Input } from '@angular/core'; import { Component, OnInit, OnDestroy, Inject, Optional, ViewEncapsulation, RendererFactory2, PLATFORM_ID, ChangeDetectionStrategy, HostListener, Input, DOCUMENT } from '@angular/core';
import { Router, NavigationStart, NavigationEnd, RouteConfigLoadStart, RouteConfigLoadEnd, ActivatedRoute, PRIMARY_OUTLET } from '@angular/router'; import { Router, NavigationStart, NavigationEnd, RouteConfigLoadStart, RouteConfigLoadEnd, ActivatedRoute, PRIMARY_OUTLET } from '@angular/router';
import { Meta, Title, MetaDefinition } from '@angular/platform-browser'; import { DOCUMENT } from "@angular/common"; import { Meta, Title, MetaDefinition } from '@angular/platform-browser';
import { Subscription, Observable } from 'rxjs'; import { Subscription, Observable } from 'rxjs';
import { distinctUntilChanged } from 'rxjs/operators'; import { distinctUntilChanged } from 'rxjs/operators';
import { Store, Action } from '@ngrx/store'; import { Store, Action } from '@ngrx/store';

7
projects/common/src/fm/components/back-button/back-button.component.html
View File

@@ -1,4 +1,5 @@
<div *ngIf="show()" class="back-button mb-2"> @if (show()) {
<div class="back-button mb-2">
<i class="fal fa-arrow-left"></i>&nbsp;<span i18n="@FmBackButton">Back</span> <i class="fal fa-arrow-left"></i>&nbsp;<span i18n="@FmBackButton">Back</span>
</div> </div>
}

48
projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html
View File

@@ -5,32 +5,34 @@
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="cropper"> <div class="cropper">
<div *ngIf="!isImageLoaded" class="no-image" (click)="fileInput.click()"> @if (!isImageLoaded) {
<i class="fal fa-image"></i> <div class="no-image" (click)="fileInput.click()">
<div i18n>No image selected</div> <i class="fal fa-image"></i>
</div> <div i18n>No image selected</div>
<image-cropper #imageCropper output="base64" </div>
[imageChangedEvent]="imageChangedEvent" }
[maintainAspectRatio]="true" <image-cropper #imageCropper output="base64"
[format]="imageType" [imageChangedEvent]="imageChangedEvent"
[aspectRatio]="aspectRatio" [maintainAspectRatio]="true"
[autoCrop]="true" [format]="imageType"
[resizeToWidth]="maxWidth" [aspectRatio]="aspectRatio"
[roundCropper]="roundImage" [autoCrop]="true"
(imageCropped)="imageCropped($event)" [resizeToWidth]="maxWidth"
(imageLoaded)="imageLoaded($event)" [roundCropper]="roundImage"
(cropperReady)="cropperReady()" (imageCropped)="imageCropped($event)"
(loadImageFailed)="loadImageFailed()" (imageLoaded)="imageLoaded($event)"
[imageURL]="imageUrl" (cropperReady)="cropperReady()"
></image-cropper> (loadImageFailed)="loadImageFailed()"
[imageURL]="imageUrl"
></image-cropper>
</div> </div>
<input #fileInput type="file" (change)="fileChangeEvent($event)" style="display:none" accept="image/*"/> <input #fileInput type="file" (change)="fileChangeEvent($event)" style="display:none" accept="image/*"/>
<span class="btn btn-primary" (click)="fileInput.click()" i18n>Select image</span> <span class="btn btn-primary" (click)="fileInput.click()" i18n>Select image</span>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-primary" i18n [disabled]="!isImageLoaded" (click)="save()">Apply</button> <button type="submit" class="btn btn-primary" i18n [disabled]="!isImageLoaded" (click)="save()">Apply</button>
<button type="button" autofocus class="btn btn-secondary" (click)="modal.close('Save click')" i18n="@@buttonCancel">Cancel</button> <button type="button" autofocus class="btn btn-secondary" (click)="modal.close('Save click')" i18n="@@buttonCancel">Cancel</button>
</div> </div>
</ng-template> </ng-template>

34
projects/common/src/fm/components/gradient-select/gradient-select.component.html
View File

@@ -1,16 +1,28 @@
<div *ngIf="gradientItems" class="form-control gradient-select" (click)="handleToggleList()"> @if (gradientItems) {
<div *ngIf="selectedItem"> <div class="form-control gradient-select" (click)="handleToggleList()">
<div *ngIf="showLabel">{{selectedItem?.name}}</div> @if (selectedItem) {
<fm-gradient [gradientItem]="selectedItem"></fm-gradient> <div>
</div> @if (showLabel) {
<div>{{selectedItem?.name}}</div>
}
<fm-gradient [gradientItem]="selectedItem"></fm-gradient>
</div>
}
<div class="gradient-list" [ngClass]="{'visible':listVisible}"> <div class="gradient-list" [ngClass]="{'visible':listVisible}">
<ul *ngIf="gradientItems"> @if (gradientItems) {
<li *ngFor="let item of gradientItems" (click)="handleSelect(item)" [ngClass]="{'bg-primary':isSelected(item),'text-white':isSelected(item)} "> <ul>
<div>{{item?.name}}</div> @for (item of gradientItems; track item.code) {
<div><fm-gradient [gradientItem]="item"></fm-gradient></div> <li (click)="handleSelect(item)" [ngClass]="{'bg-primary':isSelected(item),'text-white':isSelected(item)} ">
<div>{{item?.name}}</div>
<div><fm-gradient [gradientItem]="item"></fm-gradient></div>
</li> </li>
}
</ul> </ul>
<div *ngIf="showAdd" class="addGradient"><a href="#" i18n (click)="handleAdd($event)" >Add gradient</a></div> }
@if (showAdd) {
<div class="addGradient"><a href="#" i18n (click)="handleAdd($event)" >Add gradient</a></div>
}
</div> </div>
</div> </div>
}

2
projects/common/src/fm/components/item-link/item-link.component.html
View File

@@ -1 +1 @@
<span class="item-link" (click)="copylink(copiedtt)" triggers="manual" ngbTooltip="Link copied" #copiedtt="ngbTooltip" ><i ngbTooltip='Copy link' class="fa-solid fa-link"></i> <span *ngIf="showText" i18n>Copy link</span></span> <span class="item-link" (click)="copylink(copiedtt)" triggers="manual" ngbTooltip="Link copied" #copiedtt="ngbTooltip" ><i ngbTooltip='Copy link' class="fa-solid fa-link"></i> @if (showText) {<span i18n>Copy link</span>}</span>

26
projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.html
View File

@@ -2,19 +2,29 @@
<div> <div>
<div class="card"> <div class="card">
<div class="card-header p-3 bg-primary text-white"> <div class="card-header p-3 bg-primary text-white">
<span *ngIf="uploadService.isUploading">Uploading files (<span>{{uploadService.totalProgress | number:'1.1-1'}}</span> %)</span> @if (uploadService.isUploading) {
<span *ngIf="uploadService.isUploading == false">Uploaded <span>{{uploadService.files.length}}</span> files</span> <span>Uploading files (<span>{{uploadService.totalProgress | number:'1.1-1'}}</span> %)</span>
}
@if (uploadService.isUploading == false) {
<span>Uploaded <span>{{uploadService.files.length}}</span> files</span>
}
<span title="Cancel" class="fal fa-times float-end" (click)="uploadService.close()"></span><span title="Minimize" class="fal fa-chevron-down float-end me-2" (click)="uploadService.toggleMinimize()" [ngClass]="{'fa-chevron-down': uploadService.isMinimized == false, 'fa-chevron-up':uploadService.isMinimized}"></span> <span title="Cancel" class="fal fa-times float-end" (click)="uploadService.close()"></span><span title="Minimize" class="fal fa-chevron-down float-end me-2" (click)="uploadService.toggleMinimize()" [ngClass]="{'fa-chevron-down': uploadService.isMinimized == false, 'fa-chevron-up':uploadService.isMinimized}"></span>
</div> </div>
<div [ngClass]="{'minimized': uploadService.isMinimized }"> <div [ngClass]="{'minimized': uploadService.isMinimized }">
<div class="card-block p-3"> <div class="card-block p-3">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li *ngFor="let file of uploadService.files" class="upload-file busy" [ngClass]="{'done': file.success,'busy':file.success == false,'error': file.error }"> @for (file of uploadService.files; track $index) {
<div *ngIf="file.success == false"><span class="file-name" [attr.title]="file?.fileName">{{file.fileName}}</span><span class="fal fa-times" title="Cancel" (click)="uploadService.cancelFile(file)"></span><span class="fal fa-check"></span></div> <li class="upload-file busy" [ngClass]="{'done': file.success,'busy':file.success == false,'error': file.error }">
<div *ngIf="file.success"><a href="#" (click)="handleUploadedFileClick($event,file)" class="file-name" [attr.title]="file?.fileName">{{file.fileName}}</a><span class="fal fa-check"></span></div> @if (file.success == false) {
<div class="progress-container"><div class="progress-bar" [style.width]="file.progress+'%'"></div></div> <div><span class="file-name" [attr.title]="file?.fileName">{{file.fileName}}</span><span class="fal fa-times" title="Cancel" (click)="uploadService.cancelFile(file)"></span><span class="fal fa-check"></span></div>
<div class="errormessage">{{file.errorMessage}}</div> }
</li> @if (file.success) {
<div><a href="#" (click)="handleUploadedFileClick($event,file)" class="file-name" [attr.title]="file?.fileName">{{file.fileName}}</a><span class="fal fa-check"></span></div>
}
<div class="progress-container"><div class="progress-bar" [style.width]="file.progress+'%'"></div></div>
<div class="errormessage">{{file.errorMessage}}</div>
</li>
}
</ul> </ul>
</div> </div>
</div> </div>

30
projects/common/src/fm/components/side-panel/side-panel.component.html
View File

@@ -1,14 +1,16 @@
<div class="side-panel hidden" [ngClass]="{'hidden':!visible,'collapsed':collapsed,'resizeable':(resizeable && mobile),'resizing':resizing,'left':left,'extrawide':extrawide}" [ngStyle]="{'top':top}"> <div class="side-panel hidden" [ngClass]="{'hidden':!visible,'collapsed':collapsed,'resizeable':(resizeable && mobile),'resizing':resizing,'left':left,'extrawide':extrawide}" [ngStyle]="{'top':top}">
<div *ngIf="collapsable" class="arrow rounded-end p-2" (click)="handleToggleClick($event)"> @if (collapsable) {
<i class="fal fa-chevron-left" aria-hidden="true"></i> <div class="arrow rounded-end p-2" (click)="handleToggleClick($event)">
</div> <i class="fal fa-chevron-left" aria-hidden="true"></i>
<div draggable="true" class="resizegrip" (dragstart)="handleStartGripDrag($event)" (touchstart)="handleStartGripDrag($event)" (dragend)="handleEndGripDrag()" (touchend)="handleEndGripDrag()" (drag)="handleGripDrag($event)" (touchmove)="handleGripDrag($event)"> </div>
<div></div> }
<span class="rounded"></span> <div draggable="true" class="resizegrip" (dragstart)="handleStartGripDrag($event)" (touchstart)="handleStartGripDrag($event)" (dragend)="handleEndGripDrag()" (touchend)="handleEndGripDrag()" (drag)="handleGripDrag($event)" (touchmove)="handleGripDrag($event)">
</div> <div></div>
<div class="content"> <span class="rounded"></span>
<ng-content> </div>
<div class="content">
</ng-content> <ng-content>
</div>
</div> </ng-content>
</div>
</div>

6
projects/common/src/fm/components/tag-input/tag-input.component.html
View File

@@ -1,6 +1,8 @@
<div class="tags"> <div class="tags">
<span class="tag rounded bg-primary text-white" *ngFor="let tag of tags;"><span>{{tag}}</span> <i @for (tag of tags; track $index) {
(click)="handleDeleteTag(tag)" class="fal fa-times" aria-hidden="true"></i></span><input <span class="tag rounded bg-primary text-white"><span>{{tag}}</span> <i
(click)="handleDeleteTag(tag)" class="fal fa-times" aria-hidden="true"></i></span>
}<input
type="text" #tagInputElement type="text" #tagInputElement
(blur)="handleBlur($event, false)" (blur)="handleBlur($event, false)"
(keyup)="handleKeyUp($event)" (keyup)="handleKeyUp($event)"

24
projects/common/src/fm/components/thumbnail/thumbnail.component.html
View File

@@ -1,9 +1,15 @@
<div #thumbnail class="thumbnail" [style.background-color]="itemTypeService.getColor(item.itemType)" > <div #thumbnail class="thumbnail" [style.background-color]="itemTypeService.getColor(item.itemType)" >
<div class="content"> <div class="content">
<img *ngIf="hasThumbnail()" class="card-img-top" [src]="getThumbnailUrl(item)" /> @if (hasThumbnail()) {
<div *ngIf="!hasThumbnail()" class="large-icon" [style.font-size]="getFontSize()" [style.line-height]="getLineHeight()"><i [ngClass]="itemTypeService.getIcon(item.itemType)"></i></div> <img class="card-img-top" [src]="getThumbnailUrl(item)" />
<div *ngIf="canEdit()" class="edit btn btn-secondary rounded-circle" (click)="onEditClick()"><i class="fal fa-camera"></i></div> }
</div> @if (!hasThumbnail()) {
</div> <div class="large-icon" [style.font-size]="getFontSize()" [style.line-height]="getLineHeight()"><i [ngClass]="itemTypeService.getIcon(item.itemType)"></i></div>
}
<fm-edit-image-modal #modal (changed)="onChanged($event)"></fm-edit-image-modal> @if (canEdit()) {
<div class="edit btn btn-secondary rounded-circle" (click)="onEditClick()"><i class="fal fa-camera"></i></div>
}
</div>
</div>
<fm-edit-image-modal #modal (changed)="onChanged($event)"></fm-edit-image-modal>

32
projects/common/src/fm/components/user-menu/user-menu.component.html
View File

@@ -1,17 +1,23 @@
<div> <div>
<div (click)="toggle($event)" class="rounded-circle menu-button hidden" [ngClass]="{'hidden':!user}"> <div (click)="toggle($event)" class="rounded-circle menu-button hidden" [ngClass]="{'hidden':!user}">
<span *ngIf="user"><fm-avatar [user]="user" size="40"></fm-avatar></span> @if (user) {
<div class="menu hidden" [ngClass]="{'hidden':!showMenu}"> <span><fm-avatar [user]="user" size="40"></fm-avatar></span>
<div class="card" *ngIf="user"> }
<div class="card-body"> <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">
<div class="username">{{user.name}}</div> @if (user) {
<div *ngIf="getProvider(); let provider"> <div class="card">
<small><span i18n>Provider</span><span> {{provider}}</span></small> <div class="card-body">
</div> <div class="username">{{user.name}}</div>
<div><a href="#" (click)="logout($event)" i18n>logout</a></div> @if (getProvider(); as provider) {
</div> <div>
</div> <small><span i18n>Provider</span><span> {{provider}}</span></small>
<router-outlet name="user-menu"></router-outlet> </div>
}
<div><a href="#" (click)="logout($event)" i18n>logout</a></div>
</div>
</div> </div>
}
<router-outlet name="user-menu"></router-outlet>
</div> </div>
</div>
</div> </div>

9
projects/common/src/fm/models/acl.rights.ts Normal file
View File

@@ -0,0 +1,9 @@
export interface IAclRights {
id?: number,
claim: any,
expires: Date,
rights: number,
owner: any,
deep: boolean
}

6
projects/common/src/fm/models/list.item.acl.rights.ts Normal file
View File

@@ -0,0 +1,6 @@
import { IAclRights } from './acl.rights';
import { IItem } from './item';
export interface IListItemAclRights extends IItem {
aclRights: IAclRights[]
}

13
projects/common/src/fm/models/shared.item.ts Normal file
View File

@@ -0,0 +1,13 @@
import { IUser } from "./user";
export interface ISharedItem {
code: string,
name: string,
type: string,
sharedToUser: IUser,
rights: Date,
expires: Date,
dataDate: Date,
childItems: ISharedItem[]
}

45
projects/common/src/fm/services/cache-service.ts Normal file
View File

@@ -0,0 +1,45 @@
import { Injectable } from '@angular/core';
import { OAuthService } from 'angular-oauth2-oidc';
import { Observable, ReplaySubject, Subscription, timer } from 'rxjs';
import { catchError, take } from 'rxjs/operators';
import { IItem } from '../models/item';
import { ItemService } from './item.service';
const REFRESH_INTERVAL = 15 * 60 * 1000; // 15m
@Injectable({ providedIn: 'root'})
export class CacheService {
private proxyCacheMap: { [key: string]: ReplaySubject<IItem[]> } = {};
private subscriptionMap: { [key: string]: Subscription } = {};
constructor(private itemService: ItemService, public oauthService: OAuthService) {
timer(0, REFRESH_INTERVAL).subscribe(() => {
this.subscriptionMap = {};
})
}
getItemList(itemType: string) : Observable<IItem[]> {
if (!this.proxyCacheMap[itemType]) {
this.proxyCacheMap[itemType] = new ReplaySubject(1);
}
if (this.oauthService.getAccessToken() != null && !this.subscriptionMap[itemType]) {
this.subscriptionMap[itemType] = this.itemService.getItemList(itemType)
.pipe(
catchError(error => {
this.subscriptionMap[itemType].unsubscribe();
this.subscriptionMap[itemType] = null;
throw error;
}),
).subscribe(items => {
this.proxyCacheMap[itemType].next(items);
});
}
return this.proxyCacheMap[itemType].asObservable()
.pipe(
take(1)
);
}
}

74
projects/common/src/fm/services/shared.item.service.ts Normal file
View File

@@ -0,0 +1,74 @@
import { HttpClient, HttpParams } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { IListItemAclRights } from '../models/list.item.acl.rights';
import { ISharedItem } from '../models/shared.item';
import { AppConfig } from '../shared/app.config';
import { IListItem } from '../models/list.item';
@Injectable({
providedIn: 'root'
})
export class SharedItemService {
constructor(
public httpClient: HttpClient,
public appConfig: AppConfig) {
}
apiEndpoint() {
return this.appConfig.getConfig('apiEndPoint');
}
public getSharedUsersForItem(itemCode: string): Observable<any> {
return this.httpClient.get<any>(`${this.apiEndpoint()}/api/v1/items/${itemCode}/sharedusers`);
}
getSharedItemsWithRightsInfo(userCode: string): Observable<ISharedItem[]> {
return this.httpClient.get<any>(`${this.apiEndpoint()}/api/v1/users/${userCode}/shared`);
}
shareItem(itemCode: string, userCode: string, userRights: string, expireTimespan: string, deep: boolean): Observable<any> {
const body = {
rights: userRights,
expire: expireTimespan,
deep: deep
};
return this.httpClient.post<any>(`${this.apiEndpoint()}/api/v1/items/${itemCode}/share/${userCode}`, body);
}
revokeSharedItem(itemCode: string, userCode: string): Observable<any> {
return this.httpClient.delete<any>(`${this.apiEndpoint()}/api/v1/items/${itemCode}/share/${userCode}`);
}
getSharedItemRights(sharedByMe: boolean): Observable<IListItemAclRights[]> {
let params = new HttpParams();
params = params.append('byMe', sharedByMe);
return this.httpClient.get<any>(`${this.apiEndpoint()}/api/v1/user/rights`, {params: params});
}
getSharedItemsByParent(parentCode: string): Observable<ISharedItem[]> {
return this.httpClient.get<any>(`${this.apiEndpoint()}/api/v1/items/${parentCode}/sharedchildren`);
}
getSharedWithCurrentUser(profile: string): Observable<IListItem[]> {
let params = new HttpParams();
if (profile != null) {
params = params.append('sharedBy', profile);
}
return this.httpClient.get<any>(`${this.apiEndpoint()}/api/v1/items/shared/`, {params: params});
}
// this method does not belong here, belongs in some sort of item service
public copyItem(itemCode: string, newParentCode: string, newUserCode: string): Observable<any> {
const body = {
itemCode: itemCode,
newParentCode: newParentCode,
newUserCode: newUserCode
};
return this.httpClient.post<any>(`${this.apiEndpoint()}/api/v1/items/copy`, body);
}
}

35
projects/common/src/fm/services/user-data.service.ts Normal file
View File

@@ -0,0 +1,35 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { AppConfig } from '../shared/app.config';
import { IUser } from '../models/user';
@Injectable({
providedIn: 'root'
})
export class UserDataService {
constructor(
public httpClient: HttpClient,
public appConfig: AppConfig) {
}
ApiEndpoint() {
return this.appConfig.getConfig('apiEndPoint');
}
loadUserNotifications(): Observable<any> {
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/notifications`);
}
readUserNotification(notificationCode: string): Observable<any> {
return this.httpClient.put<any>(`${this.ApiEndpoint()}/api/v1/notifications/${notificationCode}`, null);
}
deleteUserNotification(notificationCode: string): Observable<any> {
return this.httpClient.delete<any>(`${this.ApiEndpoint()}/api/v1/notifications/${notificationCode}`);
}
getUserConnections(userCode: string, active: boolean): Observable<IUser[]> {
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/users/${userCode}/connections?active=${active}`);
}
}

4
projects/common/src/fm/shared/accesstoken.interceptor.ts
View File

@@ -1,5 +1,5 @@
import { Injectable, Injector, Inject } from '@angular/core'; import { Injectable, Injector, Inject, DOCUMENT } from '@angular/core';
import { DOCUMENT } from '@angular/common'
import { AppConfig } from "./app.config"; import { AppConfig } from "./app.config";
import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http'; import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http';
import { OAuthService } from 'angular-oauth2-oidc'; import { OAuthService } from 'angular-oauth2-oidc';

18
projects/common/src/test.ts
View File

@@ -1,18 +0,0 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'core-js/es7/reflect';
import 'zone.js';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
);

7
projects/common/tsconfig.lib.json
View File

@@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "bundler",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -12,10 +12,6 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*" "node_modules/@angular/*"
@@ -31,7 +27,6 @@
"compilationMode": "partial" "compilationMode": "partial"
}, },
"exclude": [ "exclude": [
"src/test.ts",
"**/*.spec.ts" "**/*.spec.ts"
] ]
} }

11
projects/common/tsconfig.lib.prod.json
View File

@@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "bundler",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -12,15 +12,9 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*"
"node_modules/@angular/*"
] ]
} }
}, },
@@ -33,7 +27,6 @@
"compilationMode": "partial" "compilationMode": "partial"
}, },
"exclude": [ "exclude": [
"src/test.ts",
"**/*.spec.ts" "**/*.spec.ts"
] ]
} }

2
projects/common/tsconfig.spec.json
View File

@@ -3,12 +3,10 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/spec", "outDir": "../../out-tsc/spec",
"types": [ "types": [
"jasmine",
"node" "node"
] ]
}, },
"files": [ "files": [
"src/test.ts"
], ],
"include": [ "include": [
"**/*.spec.ts", "**/*.spec.ts",

32
projects/ng-openlayers/karma.conf.js
View File

@@ -1,32 +0,0 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, '../../coverage/ng-openlayers'),
reports: ['html', 'lcovonly', 'text-summary'],
fixWebpackSourcePaths: true,
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false,
restartOnFileChange: true,
});
};

50
projects/ng-openlayers/package-lock.json generated
View File

@@ -1,54 +1,63 @@
{ {
"name": "ng-openlayers", "name": "@farmmaps/ng-openlayers",
"version": "18.0.0", "version": "18.0.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ng-openlayers", "name": "@farmmaps/ng-openlayers",
"version": "18.0.0", "version": "18.0.0",
"license": "MPL-2.0", "license": "MPL-2.0",
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "^18.2.3", "@angular/common": "21.1.0",
"@angular/core": "^18.2.3", "@angular/core": "21.1.0",
"ol": "^8.2.0" "ol": "^8.2.0"
} }
}, },
"node_modules/@angular/common": { "node_modules/@angular/common": {
"version": "18.2.3", "version": "21.1.0",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.3.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/@angular/common/-/common-21.1.0.tgz",
"integrity": "sha512-NFL4yXXImSCH7i1xnHykUjHa9vl9827fGiwSV2mnf7LjSUsyDzFD8/54dNuYN9OY8AUD+PnK0YdNro6cczVyIA==", "integrity": "sha512-hL3Chp51TU9iBcIfkNtoBS1wuseP1gsyDW2IFtK5HUpAVhbso9B3fdCaDTFkU98A2unluo2YgzI6D/6IS6N+1g==",
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^18.19.1 || ^20.11.1 || >=22.0.0" "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "18.2.3", "@angular/core": "21.1.0",
"rxjs": "^6.5.3 || ^7.4.0" "rxjs": "^6.5.3 || ^7.4.0"
} }
}, },
"node_modules/@angular/core": { "node_modules/@angular/core": {
"version": "18.2.3", "version": "21.1.0",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.3.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/@angular/core/-/core-21.1.0.tgz",
"integrity": "sha512-VGhMJxj7d0rYpqVfQrcGRB7EE/BCziotft/I/YPl6bOMPSAvMukG7DXQuJdYpNrr62ks78mlzHlZX/cdmB9Prw==", "integrity": "sha512-QTl9s8GYNN0pt1k3GE6UVlfe6zWtfdykhfchinKq2YJywQ6LBM4UcZgoc56YkgscmyrRFYrr4JYUJjlzTF57+A==",
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^18.19.1 || ^20.11.1 || >=22.0.0" "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/compiler": "21.1.0",
"rxjs": "^6.5.3 || ^7.4.0", "rxjs": "^6.5.3 || ^7.4.0",
"zone.js": "~0.14.10" "zone.js": "~0.15.0 || ~0.16.0"
},
"peerDependenciesMeta": {
"@angular/compiler": {
"optional": true
},
"zone.js": {
"optional": true
}
} }
}, },
"node_modules/@petamoriken/float16": { "node_modules/@petamoriken/float16": {
@@ -246,9 +255,9 @@
} }
}, },
"node_modules/rxjs": { "node_modules/rxjs": {
"version": "7.8.1", "version": "7.8.2",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/rxjs/-/rxjs-7.8.2.tgz",
"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
"license": "Apache-2.0", "license": "Apache-2.0",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
@@ -274,13 +283,6 @@
"license": "CC0-1.0", "license": "CC0-1.0",
"peer": true "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==",
"license": "MIT",
"peer": true
},
"node_modules/zstddec": { "node_modules/zstddec": {
"version": "0.1.0", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.1.0.tgz", "resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.1.0.tgz",

4
projects/ng-openlayers/package.json
View File

@@ -31,8 +31,8 @@
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "19.2.18", "@angular/common": "^21.1.0",
"@angular/core": "19.2.18", "@angular/core": "^21.1.0",
"ol": "^8.2.0" "ol": "^8.2.0"
} }
} }

5
projects/ng-openlayers/project.json
View File

@@ -18,11 +18,10 @@
} }
}, },
"test": { "test": {
"executor": "@angular-devkit/build-angular:karma", "executor": "@angular/build:unit-test",
"options": { "options": {
"main": "libs/ng-openlayers/src/test.ts",
"tsConfig": "libs/ng-openlayers/tsconfig.spec.json", "tsConfig": "libs/ng-openlayers/tsconfig.spec.json",
"karmaConfig": "libs/ng-openlayers/karma.conf.js" "browsers": ["chromium"]
} }
}, },
"lint": { "lint": {

12
projects/ng-openlayers/src/test.ts
View File

@@ -1,12 +0,0 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'core-js/es7/reflect';
import 'zone.js';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false },
});

7
projects/ng-openlayers/tsconfig.lib.json
View File

@@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "bundler",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -12,10 +12,6 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*" "node_modules/@angular/*"
@@ -31,7 +27,6 @@
"compilationMode": "partial" "compilationMode": "partial"
}, },
"exclude": [ "exclude": [
"src/test.ts",
"**/*.spec.ts" "**/*.spec.ts"
] ]
} }

11
projects/ng-openlayers/tsconfig.lib.prod.json
View File

@@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "bundler",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -12,15 +12,9 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*"
"node_modules/@angular/*"
] ]
} }
}, },
@@ -33,7 +27,6 @@
"compilationMode": "partial" "compilationMode": "partial"
}, },
"exclude": [ "exclude": [
"src/test.ts",
"**/*.spec.ts" "**/*.spec.ts"
] ]
} }

2
projects/ng-openlayers/tsconfig.spec.json
View File

@@ -3,12 +3,10 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../dist/out-tsc", "outDir": "../../dist/out-tsc",
"types": [ "types": [
"jasmine",
"node" "node"
] ]
}, },
"files": [ "files": [
"src/test.ts"
], ],
"include": [ "include": [
"**/*.spec.ts", "**/*.spec.ts",

7
projects/ng-openlayers/tslint-prettier.json
View File

@@ -1,7 +0,0 @@
{
"extends": [
"./tslint.json",
"tslint-config-prettier",
"tslint-plugin-prettier"
]
}

32
src/karma.conf.js
View File

@@ -1,32 +0,0 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma')
],
client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, '../coverage/farmmaps-lib-app'),
reports: ['html', 'lcovonly', 'text-summary'],
fixWebpackSourcePaths: true
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false,
restartOnFileChange: true
});
};

4
src/main.ts
View File

@@ -1,6 +1,6 @@
import * as Cesium from 'cesium'; import * as Cesium from 'cesium';
import { enableProdMode } from '@angular/core'; import { enableProdMode, provideZoneChangeDetection } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module'; import { AppModule } from './app/app.module';
@@ -15,5 +15,5 @@ if (environment.production) {
window['CESIUM_BASE_URL'] = '/assets/cesium/'; window['CESIUM_BASE_URL'] = '/assets/cesium/';
window['Cesium'] = Cesium; window['Cesium'] = Cesium;
platformBrowserDynamic().bootstrapModule(AppModule) platformBrowserDynamic().bootstrapModule(AppModule, { applicationProviders: [provideZoneChangeDetection()], })
.catch(err => console.error(err)); .catch(err => console.error(err));

16
src/test.ts
View File

@@ -1,16 +0,0 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
);

2
src/tsconfig.spec.json
View File

@@ -3,12 +3,10 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/spec", "outDir": "../out-tsc/spec",
"types": [ "types": [
"jasmine",
"node" "node"
] ]
}, },
"files": [ "files": [
"test.ts",
"polyfills.ts" "polyfills.ts"
], ],
"include": [ "include": [

17
src/tslint.json
View File

@@ -1,17 +0,0 @@
{
"extends": "../tslint.json",
"rules": {
"directive-selector": [
true,
"attribute",
"app",
"camelCase"
],
"component-selector": [
true,
"element",
"app",
"kebab-case"
]
}
}

6
tsconfig.json
View File

@@ -7,7 +7,7 @@
"declaration": false, "declaration": false,
"esModuleInterop": true, "esModuleInterop": true,
"module": "es2020", "module": "es2020",
"moduleResolution": "node", "moduleResolution": "bundler",
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"experimentalDecorators": true, "experimentalDecorators": true,
"importHelpers": true, "importHelpers": true,
@@ -16,10 +16,6 @@
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"
], ],
"lib": [
"es2018",
"dom"
],
"paths": { "paths": {
"ng-openlayers": [ "ng-openlayers": [
"dist/ng-openlayers" "dist/ng-openlayers"