28 Commits
Author SHA1 Message Date
francisco 604c1176c3 Merge branch 'develop'
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
2025-12-10 14:20:39 +01:00
peter f66187d3a2 Merge branch 'develop'
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
# Conflicts:
#	package-lock.json
#	package.json
2025-08-21 10:21:42 +02:00
jenkins df0d13e5dd [ci skip] Updated packages #69
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
2025-08-11 08:15:09 +00:00
Willem Dantuma b347220dd4 Fix flag check
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
2025-08-11 10:12:09 +02:00
jenkins edeadef96f [ci skip] Updated packages #68
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
2025-08-11 07:48:07 +00:00
Willem Dantuma 267a299589 Add hideShowLayerValues flag for fm-map-map
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
2025-08-11 09:43:44 +02:00
jenkins 134220d75f [ci skip] Updated packages #67
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
2025-04-05 06:32:27 +00:00
Willem Dantuma 80ef4ed6fe Merge branch 'develop'
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
2025-04-05 08:30:19 +02:00
jenkins d21f304081 [ci skip] Updated packages #66
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
2024-12-10 07:49:03 +00:00
francisco 2bad3274fd 2024.12 from develop to master
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
Merge branch 'develop'

# Conflicts:
#	package-lock.json
#	package.json
2024-12-09 13:40:33 +01:00
jenkins 31d3e58062 [ci skip] Updated packages #65
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
2024-10-22 14:16:00 +00:00
mark 0231421cef Merge branch 'develop'
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
# Conflicts:
#	package-lock.json
2024-10-22 16:12:25 +02:00
Willem Dantuma f2c133e9bd Merge branch 'develop'
FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit
2024-09-24 20:10:52 +02:00
jenkins 1274d96f1d [ci skip] Updated packages #63
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
2024-04-24 00:09:30 +00:00
mark 35ccb4f4c5 Merge branch 'develop'
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
2024-04-23 11:54:04 +02:00
jenkins 47fbc5eab9 [ci skip] Updated packages #62
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
2024-03-20 12:00:40 +00:00
peter 564d08b5b9 Fixed build
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
2024-03-20 11:59:14 +00:00
peter 7e17a49dc6 Merge branch 'develop'
FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit
# Conflicts:
#	package-lock.json
#	package.json
2024-03-19 16:04:26 +01:00
jenkins 3f286ee042 [ci skip] Updated packages #58
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
2024-02-29 13:56:31 +00:00
peter 747499d009 Merge branch 'develop'
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
# Conflicts:
#	package-lock.json
#	package.json
2024-02-29 14:54:59 +01:00
jenkins c4f4a4f61e [ci skip] Changed by Jenkins: 57
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
2024-01-24 17:19:55 +00:00
peter 6b095b7f49 Trigger build
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
2024-01-24 17:18:09 +00:00
peter b2791eb80b Merge branch 'develop'
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
# Conflicts:
#	README.md
#	package-lock.json
#	package.json
2024-01-24 18:13:28 +01:00
jenkins 4c93a9f766 [ci skip] Changed by Jenkins: 56
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
2023-11-16 17:02:44 +00:00
peter 93554bc7c4 Update README.md
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
2023-11-16 16:40:14 +00:00
peter d074cd81cf Merge branch 'develop'
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit
2023-11-16 17:37:13 +01:00
peter 87547aafcc Update Jenkinsfile
FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit
2023-10-20 12:20:24 +00:00
peter 6ab5ba8a56 Update Jenkinsfile.develop 2023-10-20 12:20:13 +00:00
226 changed files with 8969 additions and 12730 deletions
+1 -1
View File
@@ -52,7 +52,7 @@ ng serve
``` ```
*Go*` *Go*`
Point your browser to http://localhost:4200 Point your browser to http://localhost:4200
*ESLint* *ESLint*
+1 -27
View File
@@ -129,7 +129,7 @@
"extract-i18n": { "extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n", "builder": "@angular-devkit/build-angular:extract-i18n",
"options": { "options": {
"buildTarget": "farmmaps-lib-app:build" "browserTarget": "farmmaps-lib-app:build"
} }
}, },
"test": { "test": {
@@ -294,31 +294,5 @@
}, },
"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": "."
}
} }
} }
@@ -1,224 +0,0 @@
PS DFarmmapsFarmMapsLib ng update @angularcore@19 @angularcli@19
The installed Angular CLI version is outdated.
Installing a temporary Angular CLI versioned 19.2.19 to perform the update.
Using package manager npm
Collecting installed dependencies...
Found 68 dependencies.
Fetching dependency metadata from registry...
Updating package.json with dependency @angular-devkitbuild-angular @ 19.2.19 (was 18.2.3)...
Updating package.json with dependency @angularcli @ 19.2.19 (was 18.2.3)...
Updating package.json with dependency @angularcompiler-cli @ 19.2.18 (was 18.2.3)...
Updating package.json with dependency @angularlanguage-service @ 19.2.18 (was 18.2.3)...
Updating package.json with dependency @angularlocalize @ 19.2.18 (was 18.2.3)...
Updating package.json with dependency ng-packagr @ 19.2.2 (was 18.2.1)...
Updating package.json with dependency typescript @ 5.8.3 (was 5.4.4)...
Updating package.json with dependency @angularanimations @ 19.2.18 (was 18.2.3)...
Updating package.json with dependency @angularcommon @ 19.2.18 (was 18.2.3)...
Updating package.json with dependency @angularcompiler @ 19.2.18 (was 18.2.3)...
Updating package.json with dependency @angularcore @ 19.2.18 (was 18.2.3)...
Updating package.json with dependency @angularforms @ 19.2.18 (was 18.2.3)...
Updating package.json with dependency @angularplatform-browser @ 19.2.18 (was 18.2.3)...
Updating package.json with dependency @angularplatform-browser-dynamic @ 19.2.18 (was 18.2.3)...
Updating package.json with dependency @angularrouter @ 19.2.18 (was 18.2.3)...
Updating package.json with dependency zone.js @ 0.15.1 (was 0.14.10)...
UPDATE package.json (2923 bytes)
✔ Cleaning node modules directory
✔ Installing packages
Executing migrations of package '@angularcli'
Update '@angularssr' import paths to use the new 'node' entry point when 'CommonEngine' is detected.
Migration completed (No changes made).
Update the workspace configuration by replacing deprecated options in 'angular.json' for compatibility with the latest Angular CLI changes.
UPDATE angular.json (9341 bytes)
Migration completed (1 file modified).
Optional migrations of package '@angularcli'
This package has 1 optional migration that can be executed.
Optional migrations may be skipped and executed after the update process, if preferred.
Select the migrations that you'd like to run [use-application-builder] Migrate application projects to the new build system.
(httpsangular.devtoolsclibuild-system-migration)
Migrate application projects to the new build system.
Application projects that are using the '@angular-devkitbuild-angular' package's 'browser' andor 'browser-esbuild' builders will be migrated to use the new 'application' builder.
You can read more about this, including known issues and limitations, here httpsangular.devtoolsclibuild-system-migration
Cannot update project farmmaps-lib-app to use the application builder. Only @angular-devkitbuild-angularbrowser-esbuild and @angular-devkitbuild-angularbrowser can be automatically migrated.
UPDATE tsconfig.json (902 bytes)
Migration completed (1 file modified).
Executing migrations of package '@angularcore'
Updates non-standalone Directives, Component and Pipes to 'standalonefalse' and removes 'standalonetrue' from those who are standalone.
UPDATE srcappapp.component.ts (374 bytes)
UPDATE srcapplogologo.component.ts (349 bytes)
UPDATE srcappmenumenu.component.ts (750 bytes)
UPDATE srcappregisterdeviceregisterdevice.component.ts (334 bytes)
UPDATE projectscommonsrcfmcomponentsauth-callbackauth-callback.component.ts (731 bytes)
UPDATE projectscommonsrcfmcomponentssession-clearedsession-cleared.component.ts (755 bytes)
UPDATE projectscommonsrcfmcomponentsnot-foundnot-found.component.ts (315 bytes)
UPDATE projectscommonsrcfmcomponentsapp-menuapp-menu.component.ts (870 bytes)
UPDATE projectscommonsrcfmcomponentsappapp.component.ts (8994 bytes)
UPDATE projectscommonsrcfmcomponentsavataravatar.component.ts (1240 bytes)
UPDATE projectscommonsrcfmcomponentsback-buttonback-button.component.ts (712 bytes)
UPDATE projectscommonsrcfmcomponentsedit-image-modaledit-image-modal.component.ts (2388 bytes)
UPDATE projectscommonsrcfmcomponentsgradient-selectgradient-select.component.ts (1714 bytes)
UPDATE projectscommonsrcfmcomponentsgradientgradient.component.ts (1423 bytes)
UPDATE projectscommonsrcfmcomponentshas-claimhas-claim.directive.ts (1217 bytes)
UPDATE projectscommonsrcfmcomponentshas-packagehas-package.directive.ts (1889 bytes)
UPDATE projectscommonsrcfmcomponentshas-rolehas-role.directive.ts (1216 bytes)
UPDATE projectscommonsrcfmcomponentshelp-menuhelp-menu.component.ts (908 bytes)
UPDATE projectscommonsrcfmcomponentssetting-menusetting-menu.component.ts (958 bytes)
UPDATE projectscommonsrcfmcomponentsitem-linkitem-link.component.ts (1304 bytes)
UPDATE projectscommonsrcfmcomponentsmenu-backgroundmenu-background.component.ts (800 bytes)
UPDATE projectscommonsrcfmcomponentsnot-implementednot-implemented.component.ts (280 bytes)
UPDATE projectscommonsrcfmcomponentsnotification-menunotification-menu.component.ts (941 bytes)
UPDATE projectscommonsrcfmcomponentspackage-existspackage-exists.directive.ts (1898 bytes)
UPDATE projectscommonsrcfmcomponentsresumable-file-uploadresumable-file-upload.component.ts (1774 bytes)
UPDATE projectscommonsrcfmcomponentsside-panelside-panel.component.ts (2839 bytes)
UPDATE projectscommonsrcfmcomponentstag-inputtag-input.component.ts (2990 bytes)
UPDATE projectscommonsrcfmcomponentsthumbnailthumbnail.component.ts (2968 bytes)
UPDATE projectscommonsrcfmcomponentstimespantimespan.component.ts (22797 bytes)
UPDATE projectscommonsrcfmcomponentsuser-menuuser-menu.component.ts (1174 bytes)
UPDATE projectscommonsrcfmsharedsafe.pipe.ts (352 bytes)
UPDATE srcapptesttest.component.ts (784 bytes)
UPDATE srcapplandingpagelandingpage.component.ts (482 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsaolfile-drop-targetfile-drop-target.component.ts (2615 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsmapmap.component.ts (22343 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsaolgps-locationgps-location.component.ts (2719 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsaolitem-layersitem-layers.component.ts (20542 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsaolitem-vector-sourceitem-vector-source.component.ts (9990 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsaollayer-listlayer-list.component.ts (2070 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsaollayer-valueslayer-values.component.ts (2528 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsaollayer-vector-imagelayer-vector-image.component.ts (882 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsaolpan-to-locationpan-to-location.component.ts (2836 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsaolrotation-resetrotation-reset.component.ts (1054 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsaolzoom-to-extentzoom-to-extent.component.ts (2064 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsfeature-listfeature-list.component.ts (2505 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentswidget-hostwidget-host.directive.ts (236 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsfeature-list-containerfeature-list-container.component.ts (4111 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsfeature-list-cropfieldfeature-list-cropfield.component.ts (1336 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsfeature-list-observationfeature-list-observation.component.ts (1346 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsfeature-list-croppingschemefeature-list-croppingscheme.component.ts (1497 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsfeature-list-featurefeature-list-feature.component.ts (1090 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsfeature-list-feature-containerfeature-list-feature-container.component.ts (2433 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsfeature-list-feature-cropfieldfeature-list-feature-cropfield.component.ts (1389 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsfeature-list-feature-croppingschemefeature-list-feature-croppingscheme.component.ts (1026 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsfeature-thumbnailfeature-thumbnail.component.ts (2709 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsif-zoom-to-showif-zoom-to-show.directive.ts (1853 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsitem-list-itemitem-list-item.component.ts (1476 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsitem-list-item-containeritem-list-item-container.component.ts (2644 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsitem-listitem-list.component.ts (1373 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsitem-widget-listitem-widget-list.component.ts (1963 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentslayer-switcherlayer-switcher.component.ts (3132 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentslegendhistogram-detailshistogram-details.component.ts (784 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentslegendlegend.component.ts (2698 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentslegendstatistics-detailsstatistics-details.component.ts (848 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsmap-searchmap-search.component.ts (7783 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsmeta-data-modalmeta-data-modal.component.ts (2038 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsselect-period-modalselect-period-modal.component.ts (3542 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsselected-itemselected-item.component.ts (3209 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsselected-item-containerselected-item-container.component.ts (3273 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsselected-item-cropfieldselected-item-cropfield.component.ts (2748 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsselected-item-geotiffselected-item-geotiff.component.ts (2102 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsselected-item-shapeselected-item-shape.component.ts (2125 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentsselected-item-temporalselected-item-temporal.component.ts (3034 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentswidget-statuswidget-status.component.ts (516 bytes)
UPDATE projectscommon-mapsrcfm-mapcomponentszoom-to-show-alertzoom-to-show-alert.component.ts (570 bytes)
UPDATE projectscommon-map3dsrcfm-map3dcomponentsolcsswitch2d3dswitch2d3d.component.ts (2652 bytes)
UPDATE srcappadminadmin.component.ts (211 bytes)
UPDATE projectsng-openlayerssrclibmap.component.ts (5228 bytes)
UPDATE projectsng-openlayerssrcliblayerslayergroup.component.ts (734 bytes)
UPDATE projectsng-openlayerssrcliblayerslayervector.component.ts (1117 bytes)
UPDATE projectsng-openlayerssrclibsourcesvector.component.ts (1032 bytes)
UPDATE projectsng-openlayerssrclibfeature.component.ts (914 bytes)
UPDATE projectsng-openlayerssrclibview.component.ts (3777 bytes)
UPDATE projectsng-openlayerssrclibgraticule.component.ts (1428 bytes)
UPDATE projectsng-openlayerssrcliblayerslayerimage.component.ts (986 bytes)
UPDATE projectsng-openlayerssrcliblayerslayertile.component.ts (920 bytes)
UPDATE projectsng-openlayerssrcliblayerslayervectortile.component.ts (1334 bytes)
UPDATE projectsng-openlayerssrclibtilegrid.component.ts (976 bytes)
UPDATE projectsng-openlayerssrclibsourcesxyz.component.ts (2744 bytes)
UPDATE projectsng-openlayerssrclibsourcesosm.component.ts (1908 bytes)
UPDATE projectsng-openlayerssrclibsourcesbingmaps.component.ts (1184 bytes)
UPDATE projectsng-openlayerssrclibsourcescluster.component.ts (1444 bytes)
UPDATE projectsng-openlayerssrclibtilegridwmts.component.ts (714 bytes)
UPDATE projectsng-openlayerssrclibsourcestilewmts.component.ts (3079 bytes)
UPDATE projectsng-openlayerssrclibsourcesvectortile.component.ts (1842 bytes)
UPDATE projectsng-openlayerssrclibsourcestilewms.component.ts (1518 bytes)
UPDATE projectsng-openlayerssrclibsourcestilejson.component.ts (775 bytes)
UPDATE projectsng-openlayerssrclibsourcesgeojson.component.ts (1095 bytes)
UPDATE projectsng-openlayerssrclibsourcesimagestatic.component.ts (2471 bytes)
UPDATE projectsng-openlayerssrclibsourcesimagewms.component.ts (2109 bytes)
UPDATE projectsng-openlayerssrclibsourcesimagearcgisrest.component.ts (2059 bytes)
UPDATE projectsng-openlayerssrclibsourcesraster.component.ts (1768 bytes)
UPDATE projectsng-openlayerssrclibgeomgeometrycircle.component.ts (905 bytes)
UPDATE projectsng-openlayerssrclibgeomgeometrylinestring.component.ts (765 bytes)
UPDATE projectsng-openlayerssrclibgeomgeometrymultilinestring.component.ts (816 bytes)
UPDATE projectsng-openlayerssrclibgeomgeometrymultipoint.component.ts (765 bytes)
UPDATE projectsng-openlayerssrclibgeomgeometrymultipolygon.component.ts (841 bytes)
UPDATE projectsng-openlayerssrclibgeomgeometrypoint.component.ts (706 bytes)
UPDATE projectsng-openlayerssrclibgeomgeometrypolygon.component.ts (784 bytes)
UPDATE projectsng-openlayerssrclibcontent.component.ts (248 bytes)
UPDATE projectsng-openlayerssrcliboverlay.component.ts (1218 bytes)
UPDATE projectsng-openlayerssrclibcoordinate.component.ts (2457 bytes)
UPDATE projectsng-openlayerssrclibcollectioncoordinates.component.ts (3392 bytes)
UPDATE projectsng-openlayerssrclibstylesstyle.component.ts (1421 bytes)
UPDATE projectsng-openlayerssrclibstylescircle.component.ts (1621 bytes)
UPDATE projectsng-openlayerssrclibstylestext.component.ts (2204 bytes)
UPDATE projectsng-openlayerssrclibstylesstroke.component.ts (2972 bytes)
UPDATE projectsng-openlayerssrclibstylesicon.component.ts (2091 bytes)
UPDATE projectsng-openlayerssrclibstylesfill.component.ts (2201 bytes)
UPDATE projectsng-openlayerssrclibcontrolsdefault.component.ts (1189 bytes)
UPDATE projectsng-openlayerssrclibcontrolscontrol.component.ts (914 bytes)
UPDATE projectsng-openlayerssrclibcontrolsattribution.component.ts (898 bytes)
UPDATE projectsng-openlayerssrclibcontrolsfullscreen.component.ts (880 bytes)
UPDATE projectsng-openlayerssrclibcontrolsmouseposition.component.ts (1033 bytes)
UPDATE projectsng-openlayerssrclibcontrolsoverviewmap.component.ts (1292 bytes)
UPDATE projectsng-openlayerssrclibcontrolsrotate.component.ts (853 bytes)
UPDATE projectsng-openlayerssrclibcontrolsscaleline.component.ts (680 bytes)
UPDATE projectsng-openlayerssrclibcontrolszoom.component.ts (916 bytes)
UPDATE projectsng-openlayerssrclibcontrolszoomslider.component.ts (862 bytes)
UPDATE projectsng-openlayerssrclibcontrolszoomtoextent.component.ts (911 bytes)
UPDATE projectsng-openlayerssrclibformatsmvt.component.ts (667 bytes)
UPDATE projectsng-openlayerssrclibinteractionsdefault.component.ts (1075 bytes)
UPDATE projectsng-openlayerssrclibinteractionsdoubleclickzoom.component.ts (689 bytes)
UPDATE projectsng-openlayerssrclibinteractionsdraganddrop.component.ts (824 bytes)
UPDATE projectsng-openlayerssrclibinteractionsdragbox.component.ts (805 bytes)
UPDATE projectsng-openlayerssrclibinteractionsdragpan.component.ts (739 bytes)
UPDATE projectsng-openlayerssrclibinteractionsdragrotate.component.ts (720 bytes)
UPDATE projectsng-openlayerssrclibinteractionsdragrotateandzoom.component.ts (755 bytes)
UPDATE projectsng-openlayerssrclibinteractionsdragzoom.component.ts (769 bytes)
UPDATE projectsng-openlayerssrclibinteractionsmousewheelzoom.component.ts (719 bytes)
UPDATE projectsng-openlayerssrclibinteractionspinchzoom.component.ts (674 bytes)
UPDATE projectsng-openlayerssrclibinteractionsdraw.component.ts (2579 bytes)
UPDATE projectsng-openlayerssrclibinteractionskeyboardpan.component.ts (674 bytes)
UPDATE projectsng-openlayerssrclibinteractionskeyboardzoom.component.ts (673 bytes)
UPDATE projectsng-openlayerssrclibinteractionsselect.component.ts (2121 bytes)
UPDATE projectsng-openlayerssrclibinteractionsmodify.component.ts (2173 bytes)
UPDATE projectsng-openlayerssrclibinteractionstranslate.component.ts (2062 bytes)
UPDATE projectsng-openlayerssrclibattribution.component.ts (379 bytes)
UPDATE projectsng-openlayerssrclibattributions.component.ts (869 bytes)
UPDATE projectsng-openlayerssrclibsourcesutfgrid.component.ts (841 bytes)
Migration completed (150 files modified).
Updates ExperimentalPendingTasks to PendingTasks.
Migration completed (No changes made).
Adds `BootstrapContext` to `bootstrapApplication` calls in `main.server.ts` to support server rendering.
Migration completed (No changes made).
Optional migrations of package '@angularcore'
This package has 1 optional migration that can be executed.
Optional migrations may be skipped and executed after the update process, if preferred.
Select the migrations that you'd like to run [provide-initializer] Replaces `APP_INITIALIZER`, `ENVIRONMENT_INITIALIZER` & `PLATFORM_INITIALIZER` respectively with
`provideAppInitializer`, `provideEnvironmentInitializer` & `providePlatformInitializer`.
Replaces `APP_INITIALIZER`, `ENVIRONMENT_INITIALIZER` & `PLATFORM_INITIALIZER` respectively with `provideAppInitializer`, `provideEnvironmentInitializer` & `providePlatformInitializer`.
UPDATE projectscommonsrcfmcommon-service.module.ts (3960 bytes)
Migration completed (1 file modified).
PS DFarmmapsFarmMapsLib
+4196 -8041
View File
File diff suppressed because it is too large Load Diff
+34 -43
View File
@@ -1,7 +1,7 @@
{ {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "4.19.0", "version": "4.19.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
"build": "ng build", "build": "ng build",
@@ -10,63 +10,63 @@
"e2e": "ng e2e" "e2e": "ng e2e"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular-eslint/eslint-plugin": "21.1.0", "@angular-eslint/eslint-plugin": "^18.2.0",
"@angular/animations": "21.1.0", "@angular/animations": "18.2.3",
"@angular/common": "21.1.0", "@angular/common": "18.2.3",
"@angular/compiler": "21.1.0", "@angular/compiler": "18.2.3",
"@angular/core": "21.1.0", "@angular/core": "18.2.3",
"@angular/forms": "21.1.0", "@angular/forms": "18.2.3",
"@angular/platform-browser": "21.1.0", "@angular/platform-browser": "18.2.3",
"@angular/platform-browser-dynamic": "21.1.0", "@angular/platform-browser-dynamic": "18.2.3",
"@angular/router": "21.1.0", "@angular/router": "18.2.3",
"@farmmaps/common": "file:dist/common", "@farmmaps/common": "file:dist/common",
"@farmmaps/common-map": "file:dist/common-map", "@farmmaps/common-map": "file:dist/common-map",
"@farmmaps/common-map3d": "file:dist/common-map3d", "@farmmaps/common-map3d": "file:dist/common-map3d",
"@farmmaps/ng-openlayers": "file:dist/ng-openlayers", "@farmmaps/ng-openlayers": "file:dist/ng-openlayers",
"@microsoft/signalr": "10.0.0", "@microsoft/signalr": "^3.1.16",
"@ng-bootstrap/ng-bootstrap": "^20.0.0", "@ng-bootstrap/ng-bootstrap": "^17.0.1",
"@ngrx/effects": "21.0.1", "@ngrx/effects": "^18.0.2",
"@ngrx/router-store": "21.0.1", "@ngrx/router-store": "^18.0.2",
"@ngrx/store": "21.0.1", "@ngrx/store": "^18.0.2",
"@popperjs/core": "^2.11.8", "@popperjs/core": "^2.11.8",
"angular-oauth2-oidc": "20.0.2", "angular-oauth2-oidc": "^17.0.2",
"assert": "^2.0.0", "assert": "^2.0.0",
"bootstrap": "5.3.8", "bootstrap": "^5.3.3",
"browserify-zlib": "^0.2.0", "browserify-zlib": "^0.2.0",
"buffer": "^6.0.3", "buffer": "^6.0.3",
"cesium": "^1.97.0", "cesium": "^1.97.0",
"core-js": "^2.6.12", "core-js": "^2.6.12",
"https-browserify": "^1.0.0", "https-browserify": "^1.0.0",
"moment": "^2.29.4", "moment": "^2.29.4",
"ngrx-store-localstorage": "20.1.0", "ngrx-store-localstorage": "^18.0.0",
"ngx-avatars": "1.10.1", "ngx-avatars": "^1.8.0",
"ngx-clipboard": "^16.0.0", "ngx-clipboard": "^16.0.0",
"ngx-image-cropper": "9.1.6", "ngx-image-cropper": "^7.0.0",
"ngx-uploadx": "7.0.1", "ngx-uploadx": "^6.2.0",
"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.1",
"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",
"tslib": "^2.4.0", "tslib": "^2.4.0",
"url": "^0.11.0", "url": "^0.11.0",
"util": "^0.12.4", "util": "^0.12.4",
"zone.js": "~0.15.1" "zone.js": "~0.14.10"
}, },
"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": "^21.0.3", "@angular-builders/custom-webpack": "^18.0.0",
"@angular-devkit/build-angular": "21.1.0", "@angular-devkit/build-angular": "18.2.3",
"@angular/cli": "21.1.0", "@angular/cli": "18.2.3",
"@angular/compiler-cli": "21.1.0", "@angular/compiler-cli": "18.2.3",
"@angular/language-service": "21.1.0", "@angular/language-service": "18.2.3",
"@angular/localize": "21.1.0", "@angular/localize": "18.2.3",
"@types/arcgis-rest-api": "^10.4.5", "@types/arcgis-rest-api": "^10.4.5",
"@types/jasmine": "~2.8.8", "@types/jasmine": "~2.8.8",
"@types/jasminewd2": "^2.0.9", "@types/jasminewd2": "^2.0.9",
@@ -85,18 +85,9 @@
"karma-coverage-istanbul-reporter": "^3.0.3", "karma-coverage-istanbul-reporter": "^3.0.3",
"karma-jasmine": "^5.1.0", "karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.0.0", "karma-jasmine-html-reporter": "^2.0.0",
"ng-packagr": "^21.1.0", "ng-packagr": "^18.2.1",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"ts-node": "^8.8.1", "ts-node": "^8.8.1",
"typescript": "~5.9.3" "typescript": "~5.4.4"
},
"overrides": {
"ngx-avatars": {
"@angular/common": "$@angular/common",
"@angular/core": "$@angular/core"
},
"ngx-uploadx": {
"@angular/core": "$@angular/core"
}
} }
} }
+70 -140
View File
@@ -11,49 +11,11 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "21.1.0", "@angular/core": "^18.2.3",
"@farmmaps/common": "file:../../dist/common", "@ngrx/effects": "^18.0.2",
"@farmmaps/ng-openlayers": "file:../../dist/ng-openlayers", "@ngrx/router-store": "^18.0.2",
"@ngrx/effects": "21.0.1", "@ngrx/store": "^18.0.2",
"@ngrx/router-store": "21.0.1", "ngrx-store-localstorage": "^18",
"@ngrx/store": "21.0.1",
"ngrx-store-localstorage": "20.1.0",
"rxjs": "7.8.1",
"tassign": "^1.0.0"
}
},
"../../../../dist/common": {
"extraneous": true
},
"../../../../dist/ng-openlayers": {
"extraneous": true
},
"../../../dist/ng-openlayers": {
"extraneous": true
},
"../../dist/common": {
"name": "@farmmaps/common",
"version": "21.1.0",
"peer": true,
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/common": "21.1.0",
"@angular/core": "21.1.0",
"@angular/forms": "21.1.0",
"@microsoft/signalr": "10.0.0",
"@ng-bootstrap/ng-bootstrap": "^20.0.0",
"@ngrx/effects": "21.0.1",
"@ngrx/router-store": "21.0.1",
"@ngrx/store": "21.0.1",
"angular-oauth2-oidc": "20.0.2",
"bootstrap": "^5.3.3",
"moment": "^2.29.4",
"ngx-avatars": "1.10.1",
"ngx-clipboard": "^16.0.0",
"ngx-image-cropper": "9.1.6",
"ngx-uploadx": "7.0.1",
"tassign": "^1.0.0" "tassign": "^1.0.0"
} }
}, },
@@ -70,94 +32,56 @@
"ol": "^8.2.0" "ol": "^8.2.0"
} }
}, },
"../../dist/ng-openlayers": {
"name": "@farmmaps/ng-openlayers",
"version": "20.0.1",
"peer": true,
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/common": ">=19.0.0 <=20.x.x",
"@angular/core": ">=19.0.0 <=20.x.x",
"ol": "~10.7.0"
}
},
"../ng-openlayers": {
"name": "@farmmaps/ng-openlayers",
"version": "20.0.1",
"extraneous": true,
"peerDependencies": {
"@angular/common": ">=19.0.0 <=20.x.x",
"@angular/core": ">=19.0.0 <=20.x.x",
"ol": "~10.7.0"
}
},
"dist/common": {
"extraneous": true
},
"dist/ng-openlayers": { "dist/ng-openlayers": {
"extraneous": true "extraneous": true
}, },
"node_modules/@angular/common": { "node_modules/@angular/common": {
"version": "21.1.0", "version": "18.2.3",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-21.1.0.tgz", "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.3.tgz",
"integrity": "sha512-hL3Chp51TU9iBcIfkNtoBS1wuseP1gsyDW2IFtK5HUpAVhbso9B3fdCaDTFkU98A2unluo2YgzI6D/6IS6N+1g==", "integrity": "sha512-NFL4yXXImSCH7i1xnHykUjHa9vl9827fGiwSV2mnf7LjSUsyDzFD8/54dNuYN9OY8AUD+PnK0YdNro6cczVyIA==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^20.19.0 || ^22.12.0 || >=24.0.0" "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "21.1.0", "@angular/core": "18.2.3",
"rxjs": "^6.5.3 || ^7.4.0" "rxjs": "^6.5.3 || ^7.4.0"
} }
}, },
"node_modules/@angular/core": { "node_modules/@angular/core": {
"version": "21.1.0", "version": "18.2.3",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-21.1.0.tgz", "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.3.tgz",
"integrity": "sha512-QTl9s8GYNN0pt1k3GE6UVlfe6zWtfdykhfchinKq2YJywQ6LBM4UcZgoc56YkgscmyrRFYrr4JYUJjlzTF57+A==", "integrity": "sha512-VGhMJxj7d0rYpqVfQrcGRB7EE/BCziotft/I/YPl6bOMPSAvMukG7DXQuJdYpNrr62ks78mlzHlZX/cdmB9Prw==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^20.19.0 || ^22.12.0 || >=24.0.0" "node": "^18.19.1 || ^20.11.1 || >=22.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.15.0 || ~0.16.0" "zone.js": "~0.14.10"
},
"peerDependenciesMeta": {
"@angular/compiler": {
"optional": true
},
"zone.js": {
"optional": true
}
} }
}, },
"node_modules/@angular/platform-browser": { "node_modules/@angular/platform-browser": {
"version": "21.1.0", "version": "18.2.3",
"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-21.1.0.tgz", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.3.tgz",
"integrity": "sha512-Drkal25x+OuRQosAE/cL4uM5WDmgFehanCpsjQ1jGp6Rxoad6Q5Do1uQAE3qgMKHL1aqCPZ+uWzcVVG+Bn1ddg==", "integrity": "sha512-M2ob4zN7tAcL2mx7U6KnZNqNFPFl9MlPBE0FrjQjIzAjU0wSYPIJXmaPu9aMUp9niyo+He5iX98I+URi2Yc99g==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^20.19.0 || ^22.12.0 || >=24.0.0" "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/animations": "21.1.0", "@angular/animations": "18.2.3",
"@angular/common": "21.1.0", "@angular/common": "18.2.3",
"@angular/core": "21.1.0" "@angular/core": "18.2.3"
}, },
"peerDependenciesMeta": { "peerDependenciesMeta": {
"@angular/animations": { "@angular/animations": {
@@ -166,75 +90,76 @@
} }
}, },
"node_modules/@angular/router": { "node_modules/@angular/router": {
"version": "21.1.0", "version": "18.2.3",
"resolved": "https://registry.npmjs.org/@angular/router/-/router-21.1.0.tgz", "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.3.tgz",
"integrity": "sha512-Sneu0ePuH+bf8ZslRX3iQk1iLziindLskdTeHV1ZCrXdT0ZScsZyI/gjxQKBtsIU9692D2DnFQRLGnzTBYVGVw==", "integrity": "sha512-fvD9eSDIiIbeYoUokoWkXzu7/ZaxlzKPUHFqX1JuKuH5ciQDeT/d7lp4mj31Bxammhohzi3+z12THJYsCkj/iQ==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^20.19.0 || ^22.12.0 || >=24.0.0" "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "21.1.0", "@angular/common": "18.2.3",
"@angular/core": "21.1.0", "@angular/core": "18.2.3",
"@angular/platform-browser": "21.1.0", "@angular/platform-browser": "18.2.3",
"rxjs": "^6.5.3 || ^7.4.0" "rxjs": "^6.5.3 || ^7.4.0"
} }
}, },
"node_modules/@farmmaps/common": {
"resolved": "../../dist/common",
"link": true
},
"node_modules/@farmmaps/ng-openlayers": {
"resolved": "../../dist/ng-openlayers",
"link": true
},
"node_modules/@ngrx/effects": { "node_modules/@ngrx/effects": {
"version": "21.0.1", "version": "18.0.2",
"resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-21.0.1.tgz", "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-18.0.2.tgz",
"integrity": "sha512-hSdpToAiSYa5FJ/CAygQHpnCaF2S1HO7q/57ob3XvNTWmkofa0VqI/IIe4W57bojh2YOWCJ91SCn3kAjymaV3g==", "integrity": "sha512-YojXcOD9Lsq4kl2HCjENccyUM/mOlgBdtddsg9j/ojzSUgu3ZuBVKLN3atrL2TJYkbMX1MN0RzafSkL3TPGFIA==",
"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": "^21.0.0", "@angular/core": "^18.0.0",
"@ngrx/store": "21.0.1", "@ngrx/store": "18.0.2",
"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": "21.0.1", "version": "18.0.2",
"resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-21.0.1.tgz", "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-18.0.2.tgz",
"integrity": "sha512-hacH8ciwCRMLg7p7bThslYn564GOyS5LPf9c8cX4FTyOH+iJM32eJd2Lt64cA62vN6ruofV/IM2vB09nCkxHzg==", "integrity": "sha512-jUrQ/uJJ53x8O1XbN2YxH2GpRREZlwS5gRxlCoc4fWL4Us/uS1/K6+QfRmKBPtpTKBIixqsOb+dIUV5iwBrivA==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "^21.0.0", "@angular/common": "^18.0.0",
"@angular/core": "^21.0.0", "@angular/core": "^18.0.0",
"@angular/router": "^21.0.0", "@angular/router": "^18.0.0",
"@ngrx/store": "21.0.1", "@ngrx/store": "18.0.2",
"rxjs": "^6.5.3 || ^7.5.0" "rxjs": "^6.5.3 || ^7.5.0"
} }
}, },
"node_modules/@ngrx/store": { "node_modules/@ngrx/store": {
"version": "21.0.1", "version": "18.0.2",
"resolved": "https://registry.npmjs.org/@ngrx/store/-/store-21.0.1.tgz", "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-18.0.2.tgz",
"integrity": "sha512-2hGnw/c5o8nmKzyx7TrUUM7FXjE2zqjX0EF+wLbw9Oy/L+VdCmx+ZI1BFjuAR4B8PKEWHG2KSbOM13SMNkpZiA==", "integrity": "sha512-ajwv0+njsO4vzArp9esnFvs1wyUb1U1W8E8LSCKrcW2hWWo9o1Pezj+JRsdQwatxHfrrPFuTDyajsl6GQM/JSA==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "^21.0.0", "@angular/core": "^18.0.0",
"rxjs": "^6.5.3 || ^7.5.0" "rxjs": "^6.5.3 || ^7.5.0"
} }
}, },
@@ -248,19 +173,18 @@
} }
}, },
"node_modules/ngrx-store-localstorage": { "node_modules/ngrx-store-localstorage": {
"version": "20.1.0", "version": "18.0.0",
"resolved": "https://registry.npmjs.org/ngrx-store-localstorage/-/ngrx-store-localstorage-20.1.0.tgz", "resolved": "https://registry.npmjs.org/ngrx-store-localstorage/-/ngrx-store-localstorage-18.0.0.tgz",
"integrity": "sha512-/5+i5qTxZdE8Q5qdSmj7+9JvriAnHwW7RsXzh1rrQ/UHA9vf12q6mJ6wYTTehUO4Qcl2t/K5MRkooN2eG2ZEvw==", "integrity": "sha512-WoDePvMWiWF9LQHe+dTqbpm8lxoKCPoIvA0/1enIPTmdLQsOpdDKhMSD5YgwuqDusNfEik3QslProTFGyXZwtw==",
"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": ">=20.0.0", "@angular/common": "^18.0.1",
"@angular/core": ">=20.0.0", "@angular/core": "^18.0.1",
"@ngrx/store": ">=20.0.0" "@ngrx/store": "^18.0.0"
} }
}, },
"node_modules/rxjs": { "node_modules/rxjs": {
@@ -282,6 +206,12 @@
"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
} }
} }
} }
+6 -9
View File
@@ -8,14 +8,11 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "21.1.0", "@angular/core": "18.2.3",
"@farmmaps/common": "file:../../dist/common", "ngrx-store-localstorage": "^18.0.0",
"@farmmaps/ng-openlayers": "file:../../dist/ng-openlayers", "@ngrx/effects": "^18.0.2",
"ngrx-store-localstorage": "20.1.0", "@ngrx/router-store": "^18.0.2",
"@ngrx/effects": "21.0.1", "@ngrx/store": "^18.0.2",
"@ngrx/router-store": "21.0.1", "tassign": "^1.0.0"
"@ngrx/store": "21.0.1",
"tassign": "^1.0.0",
"rxjs": "7.8.1"
} }
} }
@@ -14,9 +14,8 @@ export interface IDroppedFile {
} }
@Component({ @Component({
selector: 'fm-map-file-drop-target', selector: 'fm-map-file-drop-target',
template: '', template: ''
standalone: false
}) })
export class FileDropTargetComponent implements OnInit, OnDestroy { export class FileDropTargetComponent implements OnInit, OnDestroy {
element: Element; element: Element;
@@ -4,11 +4,10 @@ import Overlay from 'ol/Overlay';
import { fromLonLat, toLonLat } from 'ol/proj'; import { fromLonLat, toLonLat } from 'ol/proj';
@Component({ @Component({
selector: 'fm-map-gps-location', selector: 'fm-map-gps-location',
templateUrl: './gps-location.component.html', templateUrl: './gps-location.component.html',
styleUrls: ['./gps-location.component.scss'], styleUrls: ['./gps-location.component.scss']
standalone: false
}) })
export class GpsLocation implements OnInit,OnChanges{ export class GpsLocation implements OnInit,OnChanges{
@@ -22,12 +22,11 @@ import BaseLayer from 'ol/layer/Base';
import Feature from 'ol/Feature'; import Feature from 'ol/Feature';
@Component({ @Component({
selector: 'fm-map-item-layers', selector: 'fm-map-item-layers',
template: `<ng-content></ng-content>`, template: `<ng-content></ng-content>`,
providers: [ providers: [
{ provide: LayerGroupComponent, useExisting: forwardRef(() => ItemLayersComponent) } { provide: LayerGroupComponent, useExisting: forwardRef(() => ItemLayersComponent) }
], ]
standalone: false
}) })
export class ItemLayersComponent extends LayerGroupComponent implements OnChanges, OnInit,OnDestroy { export class ItemLayersComponent extends LayerGroupComponent implements OnChanges, OnInit,OnDestroy {
@@ -21,13 +21,12 @@ import { Subscription } from 'rxjs';
import { getCenter } from 'ol/extent'; import { getCenter } from 'ol/extent';
import { formatNumber } from '@angular/common'; import { formatNumber } from '@angular/common';
@Component({ @Component({
selector: 'fm-map-item-source-vector', selector: 'fm-map-item-source-vector',
template: `<ng-content></ng-content>`, template: `<ng-content></ng-content>`,
providers: [ providers: [
{ provide: SourceVectorComponent, useExisting: forwardRef(() => ItemVectorSourceComponent) } { provide: SourceVectorComponent, useExisting: forwardRef(() => ItemVectorSourceComponent) }
], ]
standalone: false
}) })
export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnDestroy, OnChanges { export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnDestroy, OnChanges {
instance: Vector<Feature<Geometry>>; instance: Vector<Feature<Geometry>>;
@@ -1,50 +1,31 @@
<div> <div>
@if (itemLayers.length > 0) { <div class="layerlist" *ngIf="itemLayers.length > 0;else noLayers">
<div class="layerlist"> <div class="list-group">
<div class="list-group"> <div *ngFor="let itemLayer of itemLayers" class="list-group-item list-group-item-action p-2 text-truncate" [ngClass]="{'active' : selectedLayer==itemLayer}">
@for (itemLayer of itemLayers; track itemLayer) { <div (click)="handleSelectLayer($event,itemLayer)" [title]="itemLayer.item.name">{{itemLayer.item.name}}</div>
<div class="list-group-item list-group-item-action p-2 text-truncate" [ngClass]="{'active' : selectedLayer==itemLayer}"> <div class="mt-1" *ngIf="selectedLayer==itemLayer && !baseLayers">
<div (click)="handleSelectLayer($event,itemLayer)" [title]="itemLayer.item.name">{{itemLayer.item.name}}</div> <span class="btn-group">
@if (selectedLayer==itemLayer && !baseLayers) { <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>
<div class="mt-1"> <a title="Transparency 25%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.25)">25%</a>
<span class="btn-group"> <a title="Transparency 50%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.5)">50%</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="Transparency 75%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.75)">75%</a>
@if (itemLayer.visible) { <a title="No transparency" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,1)">100%</a>
<a title="Transparency 25%" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.25)">25%</a> </span>
} <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>
@if (itemLayer.visible) { <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>
<a title="Transparency 50%" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.5)">50%</a> <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>
} </div>
@if (itemLayer.visible) { <div *ngIf="itemLayer.legendVisible">
<a title="Transparency 75%" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.75)">75%</a> <div class="card legend">
} <fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);" [histogramenabled]="true"></fm-map-layer-legend>
@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)) { </div>
<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> <ng-template #noLayers>
} <div class="list-group">
@if (!dataLayers) { <div class="list-group-item" i18n>No layers</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> </div>
} </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>
@@ -1,11 +1,10 @@
import { Component,Input,Output,EventEmitter } from '@angular/core'; import { Component,Input,Output,EventEmitter } from '@angular/core';
import { IItemLayer } from '../../../models/item.layer'; import { IItemLayer } from '../../../models/item.layer';
@Component({ @Component({
selector: 'fm-map-layer-list', selector: 'fm-map-layer-list',
templateUrl: './layer-list.component.html', templateUrl: './layer-list.component.html',
styleUrls: ['./layer-list.component.scss'], styleUrls: ['./layer-list.component.scss']
standalone: false
}) })
export class LayerListComponent { export class LayerListComponent {
@@ -1,27 +1,18 @@
<div #layerValues class="layer-values"> <div #layerValues class="layer-values">
@if (enabled$ | async) { <div class="cross" *ngIf="enabled$ | async">
<div class="cross" > <div class="pointer"></div>
<div class="pointer"></div> <div class="values-container border border-dark rounded p-2" *ngIf="(layerValues$ | async ) as layers">
@if ((layerValues$ | async ); as 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 class="values-container border border-dark rounded p-2"> <ul class="value-list p-0 mb-0" *ngIf="layers.length>0 ;else no_data">
<div class="lonlat pb-2 "><span class="font-weight-bold">{{lonlat$}}</span><i class="ms-2 fal fa-copy" (click)="copyToClipboard()"></i> </div> <li class="border-top pt-1 pb-1 value" *ngFor="let layerValue of layers">
@if (layers.length>0 ) { <div>{{layerValue.layerName}}</div>
<ul class="value-list p-0 mb-0"> <div>{{layerValue.date|date}}</div>
@for (layerValue of layers; track layerValue) { <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>
<li class="border-top pt-1 pb-1 value"> </li>
<div>{{layerValue.layerName}}</div> </ul>
<div>{{layerValue.date|date}}</div> <ng-template #no_data>
<div>@if (layerValue.quantity) { <div i18n class="border-top pt-1 pb-1">No data at location</div>
<span><span class="me-1">{{layerValue.quantity}}</span> </span> </ng-template>
}<span class="me-1 font-weight-bold">{{getScaledValue(layerValue)}}</span><span>{{layerValue.unit}}</span></div> </div>
</li> </div>
} </div>
</ul>
} @else {
<div i18n class="border-top pt-1 pb-1">No data at location</div>
}
</div>
}
</div>
}
</div>
@@ -14,10 +14,9 @@ import { GeoJSON, WKT } from 'ol/format';
import { Point } from 'ol/geom'; import { Point } from 'ol/geom';
@Component({ @Component({
selector: 'fm-map-layer-values', selector: 'fm-map-layer-values',
templateUrl: './layer-values.component.html', templateUrl: './layer-values.component.html',
styleUrls: ['./layer-values.component.scss'], styleUrls: ['./layer-values.component.scss']
standalone: false
}) })
export class LayerValuesComponent implements OnInit, AfterViewInit { export class LayerValuesComponent implements OnInit, AfterViewInit {
@@ -6,11 +6,10 @@ import { Geometry } from 'ol/geom';
import Feature from 'ol/Feature'; import Feature from 'ol/Feature';
@Component({ @Component({
selector: 'fm-map-aol-layer-vector-image', selector: 'fm-map-aol-layer-vector-image',
template: ` template: `
<ng-content></ng-content> <ng-content></ng-content>
`, `,
standalone: false
}) })
export class LayerVectorImageComponent extends LayerVectorComponent implements OnInit, OnDestroy, OnChanges { export class LayerVectorImageComponent extends LayerVectorComponent implements OnInit, OnDestroy, OnChanges {
//public source: Vector; //public source: Vector;
@@ -5,11 +5,10 @@ import {View} from 'ol';
import { fromLonLat } from 'ol/proj'; import { fromLonLat } from 'ol/proj';
@Component({ @Component({
selector: 'fm-map-pan-to-location', selector: 'fm-map-pan-to-location',
templateUrl: './pan-to-location.component.html', templateUrl: './pan-to-location.component.html',
styleUrls: ['./pan-to-location.component.scss'], styleUrls: ['./pan-to-location.component.scss']
standalone: false
}) })
export class PanToLocation implements OnInit,OnChanges{ export class PanToLocation implements OnInit,OnChanges{
@@ -5,11 +5,10 @@ import {View} from 'ol';
@Component({ @Component({
selector: 'fm-map-rotation-reset', selector: 'fm-map-rotation-reset',
templateUrl: './rotation-reset.component.html', templateUrl: './rotation-reset.component.html',
styleUrls: ['./rotation-reset.component.scss'], styleUrls: ['./rotation-reset.component.scss']
standalone: false
}) })
export class RotationResetComponent implements OnInit { export class RotationResetComponent implements OnInit {
view: View; view: View;
@@ -3,10 +3,9 @@ import { ActivatedRoute } from '@angular/router';
import { ViewComponent, MapComponent } from '@farmmaps/ng-openlayers'; import { ViewComponent, MapComponent } from '@farmmaps/ng-openlayers';
@Component({ @Component({
selector: 'fm-map-zoom-to-extent', selector: 'fm-map-zoom-to-extent',
template: `<ng-content></ng-content>`, template: `<ng-content></ng-content>`
standalone: false
}) })
export class ZoomToExtentComponent implements OnChanges { export class ZoomToExtentComponent implements OnChanges {
view: ViewComponent; view: ViewComponent;
@@ -10,11 +10,10 @@ import { Store } from '@ngrx/store';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
@Component({ @Component({
selector: 'fm-map-feature-list-container', selector: 'fm-map-feature-list-container',
templateUrl: './feature-list-container.component.html', templateUrl: './feature-list-container.component.html',
styleUrls: ['./feature-list-container.component.scss'], styleUrls: ['./feature-list-container.component.scss']
standalone: false
}) })
export class FeatureListContainerComponent { export class FeatureListContainerComponent {
@@ -1,20 +1,14 @@
<div class="card border-0"> <div class="card border-0">
@if ((schemeItem|async); as schemeItem) { <div class="card-body" *ngIf="(schemeItem|async);let schemeItem">
<div class="card-body"> <fm-back-button></fm-back-button>
<fm-back-button></fm-back-button> <h4 i18n>Farm</h4>
<h4 i18n>Farm</h4> <h3>{{schemeItem.name}}</h3>
<h3>{{schemeItem.name}}</h3> <div *ngIf="features;let features">
@if (features; as features) { <div class="cropfields">
<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="cropfields"> <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
@for (feature of features; track feature) { </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>
@@ -11,11 +11,10 @@ import { Observable } from 'rxjs';
@ForChild() @ForChild()
@ForItemType("vnd.farmmaps.itemtype.cropfield") @ForItemType("vnd.farmmaps.itemtype.cropfield")
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-feature-list-cropfield', selector: 'fm-map-feature-list-cropfield',
templateUrl: './feature-list-cropfield.component.html', templateUrl: './feature-list-cropfield.component.html',
styleUrls: ['./feature-list-cropfield.component.scss'], styleUrls: ['./feature-list-cropfield.component.scss']
standalone: false
}) })
export class FeatureListCropfieldComponent extends AbstractFeatureListComponent implements OnInit { export class FeatureListCropfieldComponent extends AbstractFeatureListComponent implements OnInit {
@@ -1,17 +1,13 @@
<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>
@if (features; as features) { <div *ngIf="features;let features">
<div> <div class="farms">
<div class="farms"> <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)">
@for (feature of features; track feature) { <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
<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>
</div>
@@ -13,11 +13,10 @@ import { Geometry} from 'ol/geom';
@ForItemType("vnd.farmmaps.itemtype.croppingscheme") @ForItemType("vnd.farmmaps.itemtype.croppingscheme")
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-feature-list-croppingscheme', selector: 'fm-map-feature-list-croppingscheme',
templateUrl: './feature-list-croppingscheme.component.html', templateUrl: './feature-list-croppingscheme.component.html',
styleUrls: ['./feature-list-croppingscheme.component.scss'], styleUrls: ['./feature-list-croppingscheme.component.scss']
standalone: false
}) })
export class FeatureListCroppingschemeComponent extends AbstractFeatureListComponent { export class FeatureListCroppingschemeComponent extends AbstractFeatureListComponent {
@@ -5,14 +5,13 @@ import { AbstractFeatureListFeatureComponent,FeatureListFeatureComponent } from
import { WidgetHostDirective } from '../widget-host/widget-host.directive'; import { WidgetHostDirective } from '../widget-host/widget-host.directive';
@Component({ @Component({
selector: 'fm-map-feature-list-feature-container', selector: 'fm-map-feature-list-feature-container',
template: ` template: `
<div> <div>
<ng-template fm-map-widget-host></ng-template> <ng-template fm-map-widget-host></ng-template>
</div> </div>
`, `
standalone: false
}) })
export class FeatureListFeatureContainerComponent { export class FeatureListFeatureContainerComponent {
@@ -1,16 +1,14 @@
@if (feature; as feature) { <div *ngIf="feature;let feature" class="d-flex m-0">
<div class="d-flex m-0"> <div class="p-2">
<div class="p-2"> <div class="thumbnail">
<div class="thumbnail"> <fm-map-feature-thumbnail [feature]="feature"></fm-map-feature-thumbnail>
<fm-map-feature-thumbnail [feature]="feature"></fm-map-feature-thumbnail> </div>
</div> </div>
</div> <div class="flex-grow p-2 overflow-hidden">
<div class="flex-grow p-2 overflow-hidden"> <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"><span>{{areaInHa(feature)| number:'1.2-2'}}
<div class="card-text"><span>{{areaInHa(feature)| number:'1.2-2'}} ha</span>&nbsp;<span>{{feature.get('cropTypeName')}}</span> </div>
ha</span>&nbsp;<span>{{feature.get('cropTypeName')}}</span> </div> <div class="card-text"><span>{{feature.get('datadate')|date}}</span> -
<div class="card-text"><span>{{feature.get('datadate')|date}}</span> - <span>{{feature.get('dataenddate')|date}}</span> </div>
<span>{{feature.get('dataenddate')|date}}</span> </div> </div>
</div> </div>
</div>
}
@@ -12,11 +12,10 @@ import {getArea} from 'ol/sphere';
@ForItemType("vnd.farmmaps.itemtype.cropfield") @ForItemType("vnd.farmmaps.itemtype.cropfield")
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-feature-list-feature-cropfield', selector: 'fm-map-feature-list-feature-cropfield',
templateUrl: './feature-list-feature-cropfield.component.html', templateUrl: './feature-list-feature-cropfield.component.html',
styleUrls: ['./feature-list-feature-cropfield.component.scss'], styleUrls: ['./feature-list-feature-cropfield.component.scss']
standalone: false
}) })
export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFeatureComponent { export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFeatureComponent {
@@ -1,8 +1,6 @@
@if (feature; as feature) { <div *ngIf="feature;let feature" class="row m-0">
<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>
}
@@ -10,10 +10,9 @@ import { ForItemType } from '../for-item/for-itemtype.decorator';
@ForItemType("vnd.farmmaps.itemtype.croppingscheme") @ForItemType("vnd.farmmaps.itemtype.croppingscheme")
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-feature-list-feature-croppingscheme', selector: 'fm-map-feature-list-feature-croppingscheme',
templateUrl: './feature-list-feature-croppingscheme.component.html', templateUrl: './feature-list-feature-croppingscheme.component.html',
styleUrls: ['./feature-list-feature-croppingscheme.component.scss'], styleUrls: ['./feature-list-feature-croppingscheme.component.scss']
standalone: false
}) })
export class FeatureListFeatureCroppingschemeComponent extends AbstractFeatureListFeatureComponent { export class FeatureListFeatureCroppingschemeComponent extends AbstractFeatureListFeatureComponent {
@@ -1,18 +1,12 @@
@if (feature; as feature) { <div *ngIf="feature;let feature" class="row m-0">
<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">
@if (feature.get('thumbnail')) { <img *ngIf="feature.get('thumbnail')" [src]="config.getConfig('apiEndPoint') + '/api/v1/items/'+feature.get('code')+'/thumbnail'" />
<img [src]="config.getConfig('apiEndPoint') + '/api/v1/items/'+feature.get('code')+'/thumbnail'" /> <div *ngIf="!feature.get('thumbnail')" [style.background-color]="itemTypeService.getColor(feature.get('itemType'))">
} <i [ngClass]="itemTypeService.getIcon(feature.get('itemType'))"></i>
@if (!feature.get('thumbnail')) { </div>
<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>
}
@@ -17,11 +17,10 @@ export abstract class AbstractFeatureListFeatureComponent {
} }
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-feature-list-feature', selector: 'fm-map-feature-list-feature',
templateUrl: './feature-list-feature.component.html', templateUrl: './feature-list-feature.component.html',
styleUrls: ['./feature-list-feature.component.scss'], styleUrls: ['./feature-list-feature.component.scss']
standalone: false
}) })
export class FeatureListFeatureComponent extends AbstractFeatureListFeatureComponent { export class FeatureListFeatureComponent extends AbstractFeatureListFeatureComponent {
@@ -1,20 +1,14 @@
<div class="card border-0"> <div class="card border-0">
@if ((schemeItem|async); as schemeItem) { <div class="card-body" *ngIf="(schemeItem|async);let schemeItem">
<div class="card-body"> <fm-back-button></fm-back-button>
<fm-back-button></fm-back-button> <h4 i18n>Farm</h4>
<h4 i18n>Farm</h4> <h3>{{schemeItem.name}}</h3>
<h3>{{schemeItem.name}}</h3> <div *ngIf="features;let features">
@if (features; as features) { <div class="cropfields">
<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="cropfields"> <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
@for (feature of features; track feature) { </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>
@@ -11,11 +11,10 @@ import { Observable } from 'rxjs';
@ForChild() @ForChild()
@ForItemType("vnd.farmmaps.itemtype.observation") @ForItemType("vnd.farmmaps.itemtype.observation")
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-feature-list-observation', selector: 'fm-map-feature-list-observation',
templateUrl: './feature-list-observation.component.html', templateUrl: './feature-list-observation.component.html',
styleUrls: ['./feature-list-observation.component.scss'], styleUrls: ['./feature-list-observation.component.scss']
standalone: false
}) })
export class FeatureListObservationComponent extends AbstractFeatureListComponent implements OnInit { export class FeatureListObservationComponent extends AbstractFeatureListComponent implements OnInit {
@@ -1,10 +1,6 @@
@if (features; as features) { <div *ngIf="features;let features">
<div> <fm-back-button></fm-back-button>
<fm-back-button></fm-back-button> <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)">
@for (feature of features; track feature) { <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
<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>
}
@@ -57,11 +57,10 @@ export abstract class AbstractFeatureListComponent {
} }
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-feature-list', selector: 'fm-map-feature-list',
templateUrl: './feature-list.component.html', templateUrl: './feature-list.component.html',
styleUrls: ['./feature-list.component.scss'], styleUrls: ['./feature-list.component.scss']
standalone: false
}) })
export class FeatureListComponent extends AbstractFeatureListComponent { export class FeatureListComponent extends AbstractFeatureListComponent {
@@ -6,10 +6,9 @@ import * as render from 'ol/render';
import * as style from 'ol/style'; import * as style from 'ol/style';
@Component({ @Component({
selector: 'fm-map-feature-thumbnail', selector: 'fm-map-feature-thumbnail',
templateUrl: './feature-thumbnail.component.html', templateUrl: './feature-thumbnail.component.html',
styleUrls: ['./feature-thumbnail.component.scss'], styleUrls: ['./feature-thumbnail.component.scss']
standalone: false
}) })
export class GeometryThumbnailComponent implements AfterViewInit { export class GeometryThumbnailComponent implements AfterViewInit {
@@ -3,9 +3,8 @@ import { Layer } from 'ol/layer';
import { Source } from 'ol/source'; import { Source } from 'ol/source';
import { MapComponent } from '@farmmaps/ng-openlayers'; import { MapComponent } from '@farmmaps/ng-openlayers';
@Directive({ @Directive({
selector: '[fmMapIfZoomToShow]', selector: '[fmMapIfZoomToShow]',
standalone: false
}) })
export class ifZoomToShowDirective implements OnInit { export class ifZoomToShowDirective implements OnInit {
@Input() @Input()
@@ -4,14 +4,13 @@ import { WidgetHostDirective } from '../widget-host/widget-host.directive';
import { IItem, IListItem } from '@farmmaps/common'; import { IItem, IListItem } from '@farmmaps/common';
@Component({ @Component({
selector: 'fm-map-item-list-item-container', selector: 'fm-map-item-list-item-container',
template: ` template: `
<div style="height:100%"> <div style="height:100%">
<ng-template fm-map-widget-host></ng-template> <ng-template fm-map-widget-host></ng-template>
</div> </div>
`, `
standalone: false
}) })
export class ItemListItemContainerComponent { export class ItemListItemContainerComponent {
@@ -1,6 +1,4 @@
@if (item; as item) { <div *ngIf="item;let item" class="widget" [style.background-color]="itemTypeService.getColor(item.itemType)">
<div class="widget" [style.background-color]="itemTypeService.getColor(item.itemType)"> <div class="align-middle icon" [ngClass]="itemTypeService.getIcon(item.itemType)"></div>
<div class="align-middle icon" [ngClass]="itemTypeService.getIcon(item.itemType)"></div> <div class="title">{{item.name}}</div>
<div class="title">{{item.name}}</div> </div>
</div>
}
@@ -40,11 +40,10 @@ export abstract class AbstractItemWidgetComponent {
} }
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-item-list-item', selector: 'fm-map-item-list-item',
templateUrl: './item-list-item.component.html', templateUrl: './item-list-item.component.html',
styleUrls: ['./item-list-item.component.scss'], styleUrls: ['./item-list-item.component.scss']
standalone: false
}) })
export class ItemListItemComponent extends AbstractItemListItemComponent { export class ItemListItemComponent extends AbstractItemListItemComponent {
@@ -1,11 +1,7 @@
@if (items; as items) { <div *ngIf="items;let items" class="widget-container pt-0">
<div class="widget-container pt-0"> <div class="widget" *ngFor="let item of items" (click)="handleItemClick(item)">
@for (item of items; track item) { <div class="content">
<div class="widget" (click)="handleItemClick(item)"> <fm-map-item-list-item-container [item]="item" class="item-container"></fm-map-item-list-item-container>
<div class="content"> </div>
<fm-map-item-list-item-container [item]="item" class="item-container"></fm-map-item-list-item-container>
</div>
</div>
}
</div> </div>
} </div>
@@ -28,10 +28,9 @@ export abstract class AbstractItemListComponent {
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-item-list', selector: 'fm-map-item-list',
templateUrl: './item-list.component.html', templateUrl: './item-list.component.html',
styleUrls: ['./item-list.component.scss'], styleUrls: ['./item-list.component.scss']
standalone: false
}) })
export class ItemListComponent extends AbstractItemListComponent { export class ItemListComponent extends AbstractItemListComponent {
@@ -1,11 +1,7 @@
@if (widgets; as widgets) { <div *ngIf="widgets;let widgets" class="widget-container pt-0">
<div class="widget-container pt-0"> <div class="widget" *ngFor="let widget of widgets">
@for (widget of widgets; track widget) { <div class="content">
<div class="widget"> <ng-template #widgetTemplate></ng-template>
<div class="content"> </div>
<ng-template #widgetTemplate></ng-template>
</div>
</div>
}
</div> </div>
} </div>
@@ -8,10 +8,9 @@ import { AbstractItemWidgetComponent } from '../item-list-item/item-list-item.co
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-item-widget-list', selector: 'fm-map-item-widget-list',
templateUrl: './item-widget-list.component.html', templateUrl: './item-widget-list.component.html',
styleUrls: ['./item-widget-list.component.scss'], styleUrls: ['./item-widget-list.component.scss']
standalone: false
}) })
export class ItemWidgetListComponent implements AfterViewInit { export class ItemWidgetListComponent implements AfterViewInit {
@@ -1,39 +1,37 @@
<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>
@if (selectedItemLayer$ | async; as selectedItemLayer) { <li class="nav-item py-0" *ngIf="selectedItemLayer$ | async as selectedItemLayer">
<li class="nav-item py-0"> <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>
<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> <div class="mb-4">
<div class="mb-4"> <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>
<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>
</div> </li>
</li> <li class="nav-item py-0">
} <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Aerial photos</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>Aerial photos</span></span> <fm-map-layer-list [baseLayers]="true" [itemLayers]="aerialMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
<div class="mb-4"> </div>
<fm-map-layer-list [baseLayers]="true" [itemLayers]="aerialMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list> </li>
</div> </ul>
</li> </div>
</ul> </div>
</div> </div>
</div>
</div>
@@ -6,11 +6,10 @@ import * as mapActions from '../../actions/map.actions';
import {createEmpty,extend } from 'ol/extent'; import {createEmpty,extend } from 'ol/extent';
import { filter, map, Observable } from 'rxjs'; import { filter, map, Observable } from 'rxjs';
@Component({ @Component({
selector: 'fm-map-layer-switcher', selector: 'fm-map-layer-switcher',
templateUrl: './layer-switcher.component.html', templateUrl: './layer-switcher.component.html',
styleUrls: ['./layer-switcher.component.scss'], styleUrls: ['./layer-switcher.component.scss']
standalone: false
}) })
export class LayerSwitcher implements OnInit,OnChanges{ export class LayerSwitcher implements OnInit,OnChanges{
@@ -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>
@if (showConfidenceInterval()) { <ng-container *ngIf="showConfidenceInterval()">
<div class="col-8 nopadding"><span i18n>Confidence interval</span>:</div> <div class="col-8 nopadding"><span i18n>Confidence interval</span>:</div>
<div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.confidence * 100)| number:'1.0-0'}}%</div> <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.confidence * 100)| number:'1.0-0'}}%</div>
} </ng-container>
</div> </div>
@@ -2,13 +2,12 @@ import {Component, Input} from '@angular/core';
import {IHistogram, ILayer} from '../../../models/color.map'; import {IHistogram, ILayer} from '../../../models/color.map';
@Component({ @Component({
selector: 'fm-map-histogram-details', selector: 'fm-map-histogram-details',
templateUrl: './histogram-details.component.html', templateUrl: './histogram-details.component.html',
styles: ['.nopadding{\n' + styles: ['.nopadding{\n' +
' padding: 0 !important;\n' + ' padding: 0 !important;\n' +
' margin: 0 !important;\n' + ' margin: 0 !important;\n' +
'}'], '}']
standalone: false
}) })
export class HistogramDetailsComponent { export class HistogramDetailsComponent {
@@ -1,68 +1,48 @@
@if (showLegend()) { <table class="container" *ngIf="showLegend()">
<table class="container"> <tr>
<tr> <td colspan="3">
<td colspan="3"> <div class="title">
<div class="title"> <h4 *ngIf="showTitle">{{layer.name}}</h4>
@if (showTitle) { <b *ngIf="layer.unit">({{layer.unit}})</b>
<h4>{{layer.name}}</h4> </div>
} </td>
@if (layer.unit) { <td>
<b>({{layer.unit}})</b> <a i18n-title title="more info"><i class="fal fa-info-circle text-primary" (click)="hideHistogramDetails = !hideHistogramDetails"></i></a>
} </td>
</div> <td colspan="2">
</td> <div class="title" *ngIf="histogramenabled">
<td> <h4>{{histogram}}</h4>
<a i18n-title title="more info"><i class="fal fa-info-circle text-primary" (click)="hideHistogramDetails = !hideHistogramDetails"></i></a> <b *ngIf="histogramunit">({{histogramunit}})</b>
</td> </div>
<td colspan="2"> </td>
@if (histogramenabled) { </tr>
<div class="title"> <tr *ngFor="let entry of layer.renderer.colorMap.entries; let i = index ">
<h4>{{histogram}}</h4> <td class="legend-items"><span [style.background-color]="getAlphaHex(entry.color)" [style.border-color]="getHex(entry.color)"class="color"></span></td>
@if (histogramunit) { <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>
<b>({{histogramunit}})</b> <td class="histogram-items">
} <div *ngIf="showHistogram()">
</div> <span class="bar" [style.background-color]="getHex(entry.color)" [style.width]="getPart(layer.renderer, i)">
} </span>
</td> <span *ngIf="getPercentage(layer.renderer,i) as percentage" class="bar-label">{{percentage | number:'1.0-2'}} %</span>
</tr> </div>
@for (entry of layer.renderer.colorMap.entries; track entry; let i = $index) { </td>
<tr> </tr>
<td class="legend-items"><span [style.background-color]="getAlphaHex(entry.color)" [style.border-color]="getHex(entry.color)"class="color"></span></td> <tr *ngIf="showHistogram()">
<td class="legend-items-text">@if (!entry.label) { <td colspan="4" class="pb-1 pt-1">
<span>{{getScaledValue(entry.value,layer.scale) | number:'1.0-2'}} {{legendunit}}</span> <div class="info" [ngbCollapse]="hideHistogramDetails">
}@if (entry.label) { <ng-container *ngIf="bandContainsStatistics(); else histogram">
<span>{{entry.label}}</span> <fm-map-statistics-details [statistics]="layer.renderer.band.statistics" [scale]="layer.scale"></fm-map-statistics-details>
}</td> </ng-container>
<td class="histogram-items">
@if (showHistogram()) { <ng-template #histogram>
<div> <fm-map-histogram-details [histogram]="layer.renderer.band.histogram" [scale]="layer.scale"></fm-map-histogram-details>
<span class="bar" [style.background-color]="getHex(entry.color)" [style.width]="getPart(layer.renderer, i)"> </ng-template>
</span> </div>
@if (getPercentage(layer.renderer,i); as percentage) { </td>
<span class="bar-label">{{percentage | number:'1.0-2'}} %</span> </tr>
} </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>
}
@@ -2,11 +2,10 @@ import { Component, OnInit, Input,AfterViewInit } from '@angular/core';
import { IColorMap, IColor, IColorEntry,ILayer, IRenderer } from '../../models/color.map'; import { IColorMap, IColor, IColorEntry,ILayer, IRenderer } from '../../models/color.map';
@Component({ @Component({
selector: 'fm-map-layer-legend', selector: 'fm-map-layer-legend',
templateUrl: './legend.component.html', templateUrl: './legend.component.html',
styleUrls: ['./legend.component.scss'], styleUrls: ['./legend.component.scss']
standalone: false
}) })
export class LegendComponent implements OnInit,AfterViewInit { export class LegendComponent implements OnInit,AfterViewInit {
@@ -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>
@if (statistics.confidenceIntervalLow !== undefined) { <ng-container *ngIf="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>
@@ -2,13 +2,12 @@ import { Component, Input } from '@angular/core';
import { IStatistics } from '../../../models/color.map'; import { IStatistics } from '../../../models/color.map';
@Component({ @Component({
selector: 'fm-map-statistics-details', selector: 'fm-map-statistics-details',
templateUrl: './statistics-details.component.html', templateUrl: './statistics-details.component.html',
styles: ['.nopadding{\n' + styles: ['.nopadding{\n' +
' padding: 0 !important;\n' + ' padding: 0 !important;\n' +
' margin: 0 !important;\n' + ' margin: 0 !important;\n' +
'}'], '}']
standalone: false
}) })
export class StatisticsDetailsComponent { export class StatisticsDetailsComponent {
@@ -14,7 +14,7 @@ div.map-search {
} }
.disabled { .disabled {
color: adjust(#000000,80%); color:lighten(#000000,80%);
} }
:host ::ng-deep ngb-typeahead-window.dropdown-menu { :host ::ng-deep ngb-typeahead-window.dropdown-menu {
@@ -6,11 +6,10 @@ import { IQueryState } from '@farmmaps/common';
import { IPeriodState } from '../../models/period.state'; import { IPeriodState } from '../../models/period.state';
import { tassign } from 'tassign'; import { tassign } from 'tassign';
@Component({ @Component({
selector: 'fm-map-map-search', selector: 'fm-map-map-search',
templateUrl: './map-search.component.html', templateUrl: './map-search.component.html',
styleUrls: ['./map-search.component.scss'], styleUrls: ['./map-search.component.scss']
standalone: false
}) })
export class MapSearchComponent { export class MapSearchComponent {
@@ -1,109 +1,95 @@
@if ({ <ng-container *ngIf="{
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
menuVisible:menuVisible$|async } as state">
}; as state) { <aol-map #map (moveEnd)="handleOnMoveEnd($event)" (click)="handleOnMouseDown($event)" (dblClick)="handleShowLayerValues($event)" [ngClass]="{'panel-visible':state.panelVisible,'fullscreen':state.fullscreen }" class="map">
<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> </div>
<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-view [zoom]="state.mapState.zoom" [rotation]="state.mapState.rotation">
<fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent> <aol-coordinate [x]="state.mapState.xCenter" [y]="state.mapState.yCenter" [srid]="'EPSG:4326'"></aol-coordinate>
</aol-view> <fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent>
<aol-interaction-default></aol-interaction-default> </aol-view>
<aol-interaction-dragrotateandzoom></aol-interaction-dragrotateandzoom>
<fm-map-item-layers [itemLayers]="state.baseLayers"></fm-map-item-layers> <aol-interaction-default></aol-interaction-default>
@if (!overrideOverlayLayers) { <aol-interaction-dragrotateandzoom></aol-interaction-dragrotateandzoom>
<fm-map-item-layers [itemLayers]="state.overlayLayers"></fm-map-item-layers> <fm-map-item-layers [itemLayers]="state.baseLayers"></fm-map-item-layers>
} <fm-map-item-layers *ngIf="!overrideOverlayLayers" [itemLayers]="state.overlayLayers"></fm-map-item-layers>
@if (!overrideSelectedItemLayer) { <fm-map-item-layers *ngIf="!overrideSelectedItemLayer" [itemLayer]="state.selectedItemLayer" (onPrerender)="handlePrerender($event)"></fm-map-item-layers>
<fm-map-item-layers [itemLayer]="state.selectedItemLayer" (onPrerender)="handlePrerender($event)"></fm-map-item-layers> <aol-layer-vector>
} <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>
<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> <router-outlet name="map-layers"></router-outlet>
</aol-layer-vector> <fm-map-gps-location [position]="state.position" [headingTolerance]="20" [showHeading]="devicesService.IsMobile()" [showTolerance]="devicesService.IsMobile()" [heading]="state.compassHeading"></fm-map-gps-location>
<router-outlet name="map-layers"></router-outlet> <fm-map-layer-values></fm-map-layer-values>
<fm-map-gps-location [position]="state.position" [headingTolerance]="20" [showHeading]="devicesService.IsMobile()" [showTolerance]="devicesService.IsMobile()" [heading]="state.compassHeading"></fm-map-gps-location> <div class="viewport-container" [ngStyle]="{'bottom': bottom(state.panelVisible)}">
<fm-map-layer-values></fm-map-layer-values> <div class="control-container">
<div class="viewport-container" [ngStyle]="{'bottom': bottom(state.panelVisible)}"> <router-outlet name="map-controls"></router-outlet>
<div class="control-container"> <fm-map-layer-switcher></fm-map-layer-switcher>
<router-outlet name="map-controls"></router-outlet> <fm-map-pan-to-location [position]="state.position" [mapState]="state.mapState" [animate]="true"></fm-map-pan-to-location>
<fm-map-layer-switcher></fm-map-layer-switcher> <fm-map-rotation-reset></fm-map-rotation-reset>
<fm-map-pan-to-location [position]="state.position" [mapState]="state.mapState" [animate]="true"></fm-map-pan-to-location> </div>
<fm-map-rotation-reset></fm-map-rotation-reset> <div class="slide-container" [ngClass]="{'showDataLayerSlide':state.showDataLayerSlide}">
</div> <form>
<div class="slide-container" [ngClass]="{'showDataLayerSlide':state.showDataLayerSlide}"> <input class="dataLayerSlide" (input)="handleSlideChange($event)" type="range" style="width: 100%" value="{{dataLayerSlideValue}}"/>
<form> </form>
<input class="dataLayerSlide" (input)="handleSlideChange($event)" type="range" style="width: 100%" value="{{dataLayerSlideValue}}"/> </div>
</form> </div>
</div> <fm-map-file-drop-target [parentCode]="state.parentCode" (onFileDropped)="handleFileDropped($event)"></fm-map-file-drop-target>
</div>
<fm-map-file-drop-target [parentCode]="state.parentCode" (onFileDropped)="handleFileDropped($event)"></fm-map-file-drop-target> <div *ngIf="noContent">
@if (noContent) { <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> </div>
<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 class="side-panel-container">
</div>
} <fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false" [extrawide]="state.panelExtraWide">
<div class="side-panel-container"> <div class="panel-wrapper" *ngIf="noContent">
<fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false" [extrawide]="state.panelExtraWide"> <div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)">
@if (noContent) { </div>
<div class="panel-wrapper"> <div class="panel-bottom">
@if (!(state.searchMinified)) {
<div class="panel-top bg-secondary"> <div *ngIf="!(state.selectedItem)">
</div> <fm-map-feature-list-container [features]="state.features" [selectedFeature]="state.selectedFeature" [queryState]="state.queryState" [clickedFeature]="clickedFeature"></fm-map-feature-list-container>
} </div>
<div class="panel-bottom">
@if (!(state.selectedItem)) { <div *ngIf="state.selectedItem;let item">
<div> <fm-map-selected-item-container [item]="item" [parentItem]="state.parentItem" [itemLayer]="state.selectedItemLayer" [overlayLayers]="state.overlayLayers"></fm-map-selected-item-container>
<fm-map-feature-list-container [features]="state.features" [selectedFeature]="state.selectedFeature" [queryState]="state.queryState" [clickedFeature]="clickedFeature"></fm-map-feature-list-container> </div>
</div> <div *ngIf="state.features.length == 0" class="no-results m-2">
} <div *ngIf="state.queryState.query">Cannot find <span>{{state.queryState?.query}}</span></div>
@if (state.selectedItem; as item) { <div *ngIf="state.queryState?.tags">Cannot find tag <span>{{state.queryState?.tags}}</span></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> </div>
} </fm-side-panel>
@if (state.features.length == 0) { <fm-side-panel [resizeable]="true" [visible]="!noContent" [extrawide]="state.panelExtraWide">
<div class="no-results m-2"> <router-outlet (activate)="handleSidepaneloutletActivate($event)" (deactivate)="handleSidepaneloutletDeactivate($event)"></router-outlet>
@if (state.queryState.query) { </fm-side-panel>
<div>Cannot find <span>{{state.queryState?.query}}</span></div> </div>
} </aol-map>
@if (state.queryState?.tags) { </ng-container>
<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>
}
@@ -38,11 +38,10 @@ import { tassign } from 'tassign';
import * as style from 'ol/style'; import * as style from 'ol/style';
@Component({ @Component({
selector: 'fm-map-map', selector: 'fm-map-map',
templateUrl: './map.component.html', templateUrl: './map.component.html',
styleUrls: ['./map.component.scss'], styleUrls: ['./map.component.scss']
standalone: false
}) })
export class MapComponent implements OnInit, OnDestroy, AfterViewInit { export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
@@ -9,10 +9,9 @@ export interface IMetaData {
attributes: any attributes: any
} }
@Component({ @Component({
selector: 'fm-map-meta-data-modal', selector: 'fm-map-meta-data-modal',
templateUrl: 'meta-data-modal.component.html', templateUrl: 'meta-data-modal.component.html'
standalone: false
}) })
export class MetaDataModalComponent { export class MetaDataModalComponent {
@@ -15,11 +15,10 @@ const after = (one: NgbDateStruct, two: NgbDateStruct) =>
!one || !two ? false : one.year === two.year ? one.month === two.month ? one.day === two.day !one || !two ? false : one.year === two.year ? one.month === two.month ? one.day === two.day
? false : one.day > two.day : one.month > two.month : one.year > two.year; ? false : one.day > two.day : one.month > two.month : one.year > two.year;
@Component({ @Component({
selector: 'fm-map-select-period-modal', selector: 'fm-map-select-period-modal',
templateUrl: 'select-period-modal.component.html', templateUrl: 'select-period-modal.component.html',
styleUrls: ['select-period-modal.component.scss'], styleUrls: ['select-period-modal.component.scss']
standalone: false
}) })
export class SelectPeriodModalComponent { export class SelectPeriodModalComponent {
@@ -5,11 +5,10 @@ import { WidgetHostDirective } from '../widget-host/widget-host.directive';
import { IItemLayer } from '../../models/item.layer'; import { IItemLayer } from '../../models/item.layer';
@Component({ @Component({
selector: 'fm-map-selected-item-container', selector: 'fm-map-selected-item-container',
templateUrl: './selected-item-container.component.html', templateUrl: './selected-item-container.component.html',
styleUrls: ['./selected-item-container.component.scss'], styleUrls: ['./selected-item-container.component.scss']
standalone: false
}) })
export class SelectedItemContainerComponent { export class SelectedItemContainerComponent {
@@ -1,23 +1,19 @@
<div class="spacer"></div> <div class="spacer"></div>
@if (item; as item) { <div *ngIf="item;let item">
<div> <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> <div class="card menu-card">
<div class="card menu-card"> <h1>Cropfield</h1>
<h1>Cropfield</h1> <h4>{{item.name}}</h4>
<h4>{{item.name}}</h4> <div class="card-text"><span>{{areaInHa(item)| number:'1.2-2'}} ha</span>&nbsp;<span>{{item.data.cropTypeName}}</span></div>
<div class="card-text"><span>{{areaInHa(item)| number:'1.2-2'}} ha</span>&nbsp;<span>{{item.data.cropTypeName}}</span></div> <div class="card-text"><span>{{item.data.startDate|date}}</span> - <span>{{item.data.endDate|date}}</span> </div>
<div class="card-text"><span>{{item.data.startDate|date}}</span> - <span>{{item.data.endDate|date}}</span> </div> <ul class="p-0 mt-2">
<ul class="p-0 mt-2"> <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>
@if (item.isEditable) { </ul>
<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>
@@ -15,11 +15,10 @@ import { withLatestFrom,switchMap,combineLatest } from 'rxjs/operators';
@ForItemType("vnd.farmmaps.itemtype.cropfield") @ForItemType("vnd.farmmaps.itemtype.cropfield")
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-selected-item-cropfield', selector: 'fm-map-selected-item-cropfield',
templateUrl: './selected-item-cropfield.component.html', templateUrl: './selected-item-cropfield.component.html',
styleUrls: ['./selected-item-cropfield.component.scss'], styleUrls: ['./selected-item-cropfield.component.scss']
standalone: false
}) })
export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponent implements OnInit{ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponent implements OnInit{
@@ -1,51 +1,37 @@
<div class="spacer"></div> <div class="spacer"></div>
@if (item; as item) { <div *ngIf="item;let item">
<div> <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> <div class="card menu-card">
<div class="card menu-card"> <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
@if (parentOfItemType('vnd.farmmaps.itemtype.cropfield')) { <h1>{{item.name}}</h1>
<h2>{{parentItem.name}}</h2> </div>
} <ng-container *ngIf="item?.data.layers;let layers">
<h1>{{item.name}}</h1> <div class="legend-container">
</div> <div class="card menu-card">
@if (item?.data.layers; as layers) { <div *ngIf="layers.length>1">
<div class="legend-container"> <select (change)="onLayerChanged($event.target.value)">
<div class="card menu-card"> <option *ngFor="let l of layers;" [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
@if (layers.length>1) { </select>
<div> </div>
<select (change)="onLayerChanged($event.target.value)"> <fm-map-layer-legend [showTitle]="layers.length == 1"
@for (l of layers; track l) { [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
<option [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option> </div>
} </div>
</select> <div class="card menu-card">
</div> <ul class="p-0 mt-2">
} <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>
<fm-map-layer-legend [showTitle]="layers.length == 1" <ng-container *ngIf="itemTypeService.isLayer(item)">
[layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend> <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>
</div> <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 class="card menu-card"> <li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li>
<ul class="p-0 mt-2"> <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>
@if (item.isEditable) { </ul>
<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> </div>
} <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
@if (itemTypeService.isLayer(item)) { </ng-container>
@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>
} </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>
}
@@ -12,11 +12,10 @@ import { AbstractSelectedItemComponent } from '../selected-item/selected-item.co
@ForItemType("vnd.farmmaps.itemtype.geotiff.processed") @ForItemType("vnd.farmmaps.itemtype.geotiff.processed")
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-selected-item-geotiff', selector: 'fm-map-selected-item-geotiff',
templateUrl: './selected-item-geotiff.component.html', templateUrl: './selected-item-geotiff.component.html',
styleUrls: ['./selected-item-geotiff.component.scss'], styleUrls: ['./selected-item-geotiff.component.scss']
standalone: false
}) })
export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent implements OnDestroy { export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent implements OnDestroy {
sub: Subscription; sub: Subscription;
@@ -1,49 +1,35 @@
<div class="spacer"></div> <div class="spacer"></div>
@if (item; as item) { <div *ngIf="item;let item">
<div> <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> <div class="card menu-card">
<div class="card menu-card"> <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
@if (parentOfItemType('vnd.farmmaps.itemtype.cropfield')) { <h1>{{item.name}}</h1>
<h2>{{parentItem.name}}</h2>
}
<h1>{{item.name}}</h1>
</div>
@if (item?.data.layers; as layers) {
<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) {
<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>
<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">
<ul class="p-0 mt-2">
<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>
<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>
<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>
</ng-container>
<fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
</div> </div>
</div> </div>
} </div>
@@ -12,11 +12,10 @@ import { Subscription } from 'rxjs';
@ForItemType("vnd.farmmaps.itemtype.shape.processed") @ForItemType("vnd.farmmaps.itemtype.shape.processed")
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-selected-item-shape', selector: 'fm-map-selected-item-shape',
templateUrl: './selected-item-shape.component.html', templateUrl: './selected-item-shape.component.html',
styleUrls: ['./selected-item-shape.component.scss'], styleUrls: ['./selected-item-shape.component.scss']
standalone: false
}) })
export class SelectedItemShapeComponent extends AbstractSelectedItemComponent implements OnDestroy { export class SelectedItemShapeComponent extends AbstractSelectedItemComponent implements OnDestroy {
public selectedLayer = 0; public selectedLayer = 0;
@@ -1,70 +1,52 @@
<div class="spacer"></div> <div class="spacer"></div>
@if (selectedItem(); as item) { <div *ngIf="selectedItem();let item">
<div> <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> <div class="card menu-card">
<div class="card menu-card"> <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
@if (parentOfItemType('vnd.farmmaps.itemtype.cropfield')) { <h1>{{item.name}}</h1>
<h2>{{parentItem.name}}</h2> </div>
} <ng-container *ngIf="item?.data.layers;let layers">
<h1>{{item.name}}</h1> <div class="legend-container">
</div> <div class="card menu-card">
@if (item?.data.layers; as layers) { <h5><span i18n>Date</span>: {{temporalService.selectedDate(itemLayer)}}</h5>
<div class="legend-container"> <div class="d-flex justify-content-between">
<div class="card menu-card"> <div>
<h5><span i18n>Date</span>: {{temporalService.selectedDate(itemLayer)}}</h5> <button *ngIf="temporalService.hasPrevious(itemLayer)" type="button" class="btn btn-link p-0" (click)="handlePreviousTemporal($event)">
<div class="d-flex justify-content-between"> <i class="fal fa-arrow-circle-left" aria-hidden="true" i18n-title title="Previous"></i>&nbsp;{{ temporalService.previousDate(itemLayer) }}
<div> </button>
@if (temporalService.hasPrevious(itemLayer)) { </div>
<button type="button" class="btn btn-link p-0" (click)="handlePreviousTemporal($event)"> <div>
<i class="fal fa-arrow-circle-left" aria-hidden="true" i18n-title title="Previous"></i>&nbsp;{{ temporalService.previousDate(itemLayer) }} <button *ngIf="temporalService.hasNext(itemLayer)" type="button" class="btn btn-link p-0" (click)="handleNextTemporal($event)">
</button> {{ temporalService.nextDate(itemLayer)}}&nbsp;<i class="fal fa-arrow-circle-right" aria-hidden="true" i18n-title title="Next"></i>
} </button>
</div> </div>
<div> </div>
@if (temporalService.hasNext(itemLayer)) { <fm-map-zoom-to-show-alert [layer]="currentItemLayer()?.layer"></fm-map-zoom-to-show-alert>
<button type="button" class="btn btn-link p-0" (click)="handleNextTemporal($event)"> </div>
{{ temporalService.nextDate(itemLayer)}}&nbsp;<i class="fal fa-arrow-circle-right" aria-hidden="true" i18n-title title="Next"></i> <div class="card menu-card pt-2">
</button> <div *ngIf="layers.length>1">
} <select (change)="onLayerChanged($event.target.value)">
</div> <option *ngFor="let l of layers;" [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
</div> </select>
<fm-map-zoom-to-show-alert [layer]="currentItemLayer()?.layer"></fm-map-zoom-to-show-alert> </div>
</div> <fm-map-layer-legend [showTitle]="layers.length == 1"
<div class="card menu-card pt-2"> [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
@if (layers.length>1) { </div>
<div> </div>
<select (change)="onLayerChanged($event.target.value)"> <div class="card menu-card">
@for (l of layers; track l) { <ul class="p-0 mt-2">
<option [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option> <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>
} <ng-container *ngIf="itemTypeService.isLayer(item)">
</select> <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>
</div> <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>
<fm-map-layer-legend [showTitle]="layers.length == 1" <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>
[layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend> <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>
</div> </ul>
</div> </div>
<div class="card menu-card"> </ng-container>
<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> </div>
}
@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>
}
@@ -13,11 +13,10 @@ import { AbstractSelectedItemComponent } from '../selected-item/selected-item.co
@ForItemType("vnd.farmmaps.itemtype.temporal") @ForItemType("vnd.farmmaps.itemtype.temporal")
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-selected-item-temporal', selector: 'fm-map-selected-item-temporal',
templateUrl: './selected-item-temporal.component.html', templateUrl: './selected-item-temporal.component.html',
styleUrls: ['./selected-item-temporal.component.scss'], styleUrls: ['./selected-item-temporal.component.scss']
standalone: false
}) })
export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent implements OnDestroy { export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent implements OnDestroy {
sub: Subscription; sub: Subscription;
@@ -1,31 +1,21 @@
@if (item; as item) { <div *ngIf="item;let item">
<div> <div class="card border-0">
<div class="card border-0"> <fm-thumbnail [item]="item" [edit]="item.isEditable"></fm-thumbnail>
<fm-thumbnail [item]="item" [edit]="item.isEditable"></fm-thumbnail> </div>
</div> <div class="card">
<div class="card"> <div class="card-body">
<div class="card-body"> <fm-back-button></fm-back-button>
<fm-back-button></fm-back-button> <h1 class="card-title">{{item.name}}</h1>
<h1 class="card-title">{{item.name}}</h1> <div class="card menu-card">
<div class="card menu-card"> <ul class="p-0 mt-2">
<ul class="p-0 mt-2"> <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>
@if (itemTypeService.hasViewer(item)) { <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>
<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> <ng-container *ngIf="itemTypeService.isLayer(item)">
} <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>
@if (item.isEditable) { <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>
<li><a href="#" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" title="Edit"></i> <span i18n>Edit</span></a></li> </ng-container>
} </ul>
@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>
} </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>
}
@@ -74,11 +74,10 @@ export abstract class AbstractSelectedItemComponent {
} }
@Injectable() @Injectable()
@Component({ @Component({
selector: 'fm-map-selected-item', selector: 'fm-map-selected-item',
templateUrl: './selected-item.component.html', templateUrl: './selected-item.component.html',
styleUrls: ['./selected-item.component.scss'], styleUrls: ['./selected-item.component.scss']
standalone: false
}) })
export class SelectedItemComponent extends AbstractSelectedItemComponent { export class SelectedItemComponent extends AbstractSelectedItemComponent {
@@ -1,8 +1,7 @@
import { Directive, ViewContainerRef } from '@angular/core'; import { Directive, ViewContainerRef } from '@angular/core';
@Directive({ @Directive({
selector: '[fm-map-widget-host]', selector: '[fm-map-widget-host]',
standalone: false
}) })
export class WidgetHostDirective { export class WidgetHostDirective {
constructor(public viewContainerRef: ViewContainerRef) { } constructor(public viewContainerRef: ViewContainerRef) { }
@@ -1,16 +1,6 @@
<div> <div [ngSwitch]="stage">
@switch (stage) { <h6 *ngSwitchCase="StageEnum.DevelopmentPreAlpha" style="color:darkred" [ngbTooltip]="info"><b><span i18n>Stage:Pre-alpha</span></b></h6>
@case (StageEnum.DevelopmentPreAlpha) { <h6 *ngSwitchCase="StageEnum.DevelopmentAlpha" style="color:red" [ngbTooltip]="info"><b><span i18n>Stage:Alpha</span></b></h6>
<h6 style="color:darkred" [ngbTooltip]="info"><b><span i18n>Stage:Pre-alpha</span></b></h6> <h6 *ngSwitchCase="StageEnum.DevelopmentBeta" style="color:orange" [ngbTooltip]="info" ><b><span i18n>Stage:Beta</span></b></h6>
} <h6 *ngSwitchCase="StageEnum.ReleaseCandidate" style="color:green" [ngbTooltip]="info" ><b><span i18n>Stage:RC</span></b></h6>
@case (StageEnum.DevelopmentAlpha) { </div>
<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>
@@ -1,10 +1,9 @@
import { Component, OnInit, Input } from '@angular/core'; import { Component, OnInit, Input } from '@angular/core';
@Component({ @Component({
selector: 'fm-map-widget-status', selector: 'fm-map-widget-status',
templateUrl: './widget-status.component.html', templateUrl: './widget-status.component.html',
styleUrls: ['./widget-status.component.css'], styleUrls: ['./widget-status.component.css']
standalone: false
}) })
export class WidgetStatusComponent implements OnInit { export class WidgetStatusComponent implements OnInit {
@Input() stage: Stage; @Input() stage: Stage;
@@ -2,10 +2,9 @@ import { Component, Input } from '@angular/core';
import { Layer } from 'ol/layer'; import { Layer } from 'ol/layer';
import { Source } from 'ol/source'; import { Source } from 'ol/source';
@Component({ @Component({
selector: 'fm-map-zoom-to-show-alert', selector: 'fm-map-zoom-to-show-alert',
template: '<div *fmMapIfZoomToShow="layer$" class="alert alert-info"><i class="fas fa-search-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Zoom in to show layer</span></div>', template: '<div *fmMapIfZoomToShow="layer$" class="alert alert-info"><i class="fas fa-search-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Zoom in to show layer</span></div>'
standalone: false
}) })
export class ZoomToShowAlert { export class ZoomToShowAlert {
public layer$: Layer<Source>; public layer$: Layer<Source>;
+8 -2
View File
@@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"module": "es2015", "module": "es2015",
"moduleResolution": "bundler", "moduleResolution": "node",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -12,9 +12,15 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*"
"node_modules/@angular/*"
] ]
} }
}, },
+8 -2
View File
@@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"module": "es2015", "module": "es2015",
"moduleResolution": "bundler", "moduleResolution": "node",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -12,9 +12,15 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*"
"node_modules/@angular/*"
] ]
} }
}, },
+21 -27
View File
@@ -11,8 +11,8 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "21.1.0", "@angular/common": "^18.2.3",
"@angular/core": "21.1.0", "@angular/core": "^18.2.3",
"cesium": "^1.97.0", "cesium": "^1.97.0",
"ol-cesium": ">=2.13.0" "ol-cesium": ">=2.13.0"
} }
@@ -34,46 +34,35 @@
"extraneous": true "extraneous": true
}, },
"node_modules/@angular/common": { "node_modules/@angular/common": {
"version": "21.1.0", "version": "18.2.3",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-21.1.0.tgz", "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.3.tgz",
"integrity": "sha512-hL3Chp51TU9iBcIfkNtoBS1wuseP1gsyDW2IFtK5HUpAVhbso9B3fdCaDTFkU98A2unluo2YgzI6D/6IS6N+1g==", "integrity": "sha512-NFL4yXXImSCH7i1xnHykUjHa9vl9827fGiwSV2mnf7LjSUsyDzFD8/54dNuYN9OY8AUD+PnK0YdNro6cczVyIA==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^20.19.0 || ^22.12.0 || >=24.0.0" "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "21.1.0", "@angular/core": "18.2.3",
"rxjs": "^6.5.3 || ^7.4.0" "rxjs": "^6.5.3 || ^7.4.0"
} }
}, },
"node_modules/@angular/core": { "node_modules/@angular/core": {
"version": "21.1.0", "version": "18.2.3",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-21.1.0.tgz", "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.3.tgz",
"integrity": "sha512-QTl9s8GYNN0pt1k3GE6UVlfe6zWtfdykhfchinKq2YJywQ6LBM4UcZgoc56YkgscmyrRFYrr4JYUJjlzTF57+A==", "integrity": "sha512-VGhMJxj7d0rYpqVfQrcGRB7EE/BCziotft/I/YPl6bOMPSAvMukG7DXQuJdYpNrr62ks78mlzHlZX/cdmB9Prw==",
"license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"engines": { "engines": {
"node": "^20.19.0 || ^22.12.0 || >=24.0.0" "node": "^18.19.1 || ^20.11.1 || >=22.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.15.0 || ~0.16.0" "zone.js": "~0.14.10"
},
"peerDependenciesMeta": {
"@angular/compiler": {
"optional": true
},
"zone.js": {
"optional": true
}
} }
}, },
"node_modules/@cesium/engine": { "node_modules/@cesium/engine": {
@@ -509,10 +498,9 @@
} }
}, },
"node_modules/rxjs": { "node_modules/rxjs": {
"version": "7.8.2", "version": "7.8.1",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
"integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
"license": "Apache-2.0",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"tslib": "^2.1.0" "tslib": "^2.1.0"
@@ -561,6 +549,12 @@
"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",
+2 -2
View File
@@ -8,8 +8,8 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "21.1.0", "@angular/common": "18.2.3",
"@angular/core": "21.1.0", "@angular/core": "18.2.3",
"cesium": "^1.97.0", "cesium": "^1.97.0",
"ol-cesium": ">=2.13.0" "ol-cesium": ">=2.13.0"
} }
@@ -7,11 +7,10 @@ import VectorSynchronizer from 'olcs/VectorSynchronizer';
import { mapReducers,mapActions } from '@farmmaps/common-map'; import { mapReducers,mapActions } from '@farmmaps/common-map';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
@Component({ @Component({
selector: 'fm-map3d-switch2d3d', selector: 'fm-map3d-switch2d3d',
templateUrl: './switch2d3d.component.html', templateUrl: './switch2d3d.component.html',
styleUrls: ['./switch2d3d.component.scss'], styleUrls: ['./switch2d3d.component.scss']
standalone: false
}) })
export class Switch2D3DComponent { export class Switch2D3DComponent {
+8 -2
View File
@@ -4,7 +4,7 @@
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2015", "target": "es2015",
"module": "es2015", "module": "es2015",
"moduleResolution": "bundler", "moduleResolution": "node",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -13,9 +13,15 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*"
"node_modules/@angular/*"
] ]
} }
}, },
+8 -2
View File
@@ -4,7 +4,7 @@
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2015", "target": "es2015",
"module": "es2015", "module": "es2015",
"moduleResolution": "bundler", "moduleResolution": "node",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
"inlineSources": true, "inlineSources": true,
@@ -13,9 +13,15 @@
"importHelpers": true, "importHelpers": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": [], "types": [],
"lib": [
"dom",
"es2018"
],
"paths": { "paths": {
"@angular/*": [ "@angular/*": [
"node_modules/@angular/*"
"node_modules/@angular/*"
] ]
} }
}, },
+2302 -947
View File
File diff suppressed because it is too large Load Diff
+14 -31
View File
@@ -1,42 +1,25 @@
{ {
"name": "@farmmaps/common", "name": "@farmmaps/common",
"version": "21.1.0", "version": "2.1.0",
"publishConfig": { "publishConfig": {
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/" "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
}, },
"peerDependencies": { "peerDependencies": {
"@ng-bootstrap/ng-bootstrap": "^20.0.0", "@ng-bootstrap/ng-bootstrap": "^17.0.1",
"@angular/common": "21.1.0", "@angular/common": "18.2.3",
"@angular/core": "21.1.0", "@angular/core": "18.2.3",
"@angular/forms": "21.1.0", "@angular/forms": "18.2.3",
"@ngrx/effects": "21.0.1", "@ngrx/effects": "^18.0.2",
"@ngrx/router-store": "21.0.1", "@ngrx/router-store": "^18.0.2",
"@ngrx/store": "21.0.1", "@ngrx/store": "^18.0.2",
"tassign": "^1.0.0", "tassign": "^1.0.0",
"bootstrap": "^5.3.3", "bootstrap": "^5.3.3",
"@microsoft/signalr": "10.0.0", "@microsoft/signalr": "^3.1.16",
"ngx-uploadx": "7.0.1", "ngx-uploadx": "^6.2.0",
"angular-oauth2-oidc": "20.0.2", "angular-oauth2-oidc": "^17.0.2",
"moment": "^2.29.4", "moment": "^2.29.4",
"ngx-avatars": "1.10.1", "ngx-avatars": "^1.8.0",
"ngx-image-cropper": "9.1.6", "ngx-image-cropper": "^7.0.0",
"ngx-clipboard": "^16.0.0" "ngx-clipboard": "^16.0.0"
},
"overrides": {
"ngx-avatars": {
"@angular/common": "$@angular/common",
"@angular/core": "$@angular/core"
},
"ngx-clipboard": {
"@angular/core": "$@angular/core"
},
"ngx-image-cropper": {
"@angular/common": "$@angular/common",
"@angular/core": "$@angular/core"
}
,
"ngx-uploadx": {
"@angular/core": "$@angular/core"
}
} }
} }
@@ -1,5 +1,5 @@
// angular modules // angular modules
import { NgModule, ModuleWithProviders, Injector, Optional, SkipSelf, inject, provideAppInitializer } from '@angular/core'; import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf } from '@angular/core';
import { DatePipe } from '@angular/common'; import { DatePipe } from '@angular/common';
import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { HTTP_INTERCEPTORS } from '@angular/common/http';
@@ -90,10 +90,12 @@ export class AppCommonServiceModule {
providers: [ providers: [
AppConfig, AppConfig,
ItemTypeService, ItemTypeService,
provideAppInitializer(() => { {
const initializerFn = (appConfigFactory)(inject(Injector), inject(AppConfig), inject(OAuthService), inject(AuthConfigFactory), inject(OAuthStorage), inject(ItemTypeService)); provide: APP_INITIALIZER,
return initializerFn(); useFactory: appConfigFactory,
}), deps: [Injector, AppConfig, OAuthService, AuthConfigFactory, OAuthStorage, ItemTypeService],
multi: true
},
{ {
provide: HTTP_INTERCEPTORS, provide: HTTP_INTERCEPTORS,
useClass: AccessTokenInterceptor, useClass: AccessTokenInterceptor,
+9 -9
View File
@@ -20,7 +20,7 @@ import { MODULE_NAME } from './module-name';
//components //components
import { AvatarModule } from 'ngx-avatars'; import { AvatarModule } from 'ngx-avatars';
import { ImageCropperComponent } from 'ngx-image-cropper'; import { ImageCropperModule } from 'ngx-image-cropper';
import * as commonActions from './actions/app-common.actions'; import * as commonActions from './actions/app-common.actions';
import { AppMenuComponent } from './components/app-menu/app-menu.component'; import { AppMenuComponent } from './components/app-menu/app-menu.component';
import { AppComponent } from './components/app/app.component'; import { AppComponent } from './components/app/app.component';
@@ -34,6 +34,7 @@ import { HasClaimDirective } from './components/has-claim/has-claim.directive';
import { HasPackageDirective } from './components/has-package/has-package.directive'; import { HasPackageDirective } from './components/has-package/has-package.directive';
import { HasRoleDirective } from './components/has-role/has-role.directive'; import { HasRoleDirective } from './components/has-role/has-role.directive';
import { HelpMenuComponent } from './components/help-menu/help-menu.component'; import { HelpMenuComponent } from './components/help-menu/help-menu.component';
import { SettingMenuComponent } from './components/setting-menu/setting-menu.component';
import { ItemLinkComponent } from './components/item-link/item-link.component'; import { ItemLinkComponent } from './components/item-link/item-link.component';
import { MenuBackgroundComponent } from './components/menu-background/menu-background.component'; import { MenuBackgroundComponent } from './components/menu-background/menu-background.component';
import { NotFoundComponent } from './components/not-found/not-found.component'; import { NotFoundComponent } from './components/not-found/not-found.component';
@@ -42,7 +43,6 @@ import { NotificationMenuComponent } from './components/notification-menu/notifi
import { PackageExistsDirective } from './components/package-exists/package-exists.directive'; import { PackageExistsDirective } from './components/package-exists/package-exists.directive';
import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component'; import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component';
import { SessionClearedComponent } from './components/session-cleared/session-cleared.component'; import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
import { SettingMenuComponent } from './components/setting-menu/setting-menu.component';
import { SidePanelComponent } from './components/side-panel/side-panel.component'; import { SidePanelComponent } from './components/side-panel/side-panel.component';
import { TagInputComponent } from './components/tag-input/tag-input.component'; import { TagInputComponent } from './components/tag-input/tag-input.component';
import { ThumbnailComponent } from './components/thumbnail/thumbnail.component'; import { ThumbnailComponent } from './components/thumbnail/thumbnail.component';
@@ -75,12 +75,12 @@ import { SecureOAuthStorage } from './shared/secureOAuthStorage';
export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage'); export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage');
export { export {
Alert, AppComponent, AuthCallbackComponent, AuthConfigFactory, AvatarComponent, BackButtonComponent, commonActions, Alert, AppComponent, AuthCallbackComponent, AuthConfigFactory, AvatarComponent, BackButtonComponent, commonActions,
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,
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
}; };
@NgModule({ declarations: [ @NgModule({ declarations: [
@@ -151,6 +151,6 @@ export {
UploadxModule, UploadxModule,
ClipboardModule, ClipboardModule,
AvatarModule, AvatarModule,
ImageCropperComponent], providers: [provideHttpClient(withInterceptorsFromDi())] }) ImageCropperModule], providers: [provideHttpClient(withInterceptorsFromDi())] })
export class AppCommonModule { export class AppCommonModule {
} }
@@ -1,5 +1,5 @@
<div> <div>
<div (click)="toggle($event)" class="rounded-circle menu-button hidden" [ngClass]="{'hidden':!user || noContent}"> <div (click)="toggle($event)" class="rounded-circle menu-button hidden" [ngClass]="{'hidden':!user || noContent}">
<span i18n-title title="Apps"><i class="fas fa-th" aria-hidden="true"></i></span> <span i18n-title title="Apps"><i class="fas fa-th" aria-hidden="true"></i></span>
<div class="menu hidden" [ngClass]="{'hidden':!showMenu}"> <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">
<router-outlet name="app-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet> <router-outlet name="app-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>
@@ -1,14 +1,14 @@
import { Component, Input, OnInit } from '@angular/core'; import { Component, OnInit, Input } from '@angular/core';
import { Store } from '@ngrx/store';
import * as appActions from '../../actions/app-common.actions';
import { IUser } from '../../models/user'; import { IUser } from '../../models/user';
import {Store} from '@ngrx/store';
import * as appReducers from '../../reducers/app-common.reducer'; import * as appReducers from '../../reducers/app-common.reducer';
import * as appActions from '../../actions/app-common.actions';
@Component({ @Component({
selector: 'fm-app-menu', selector: 'fm-app-menu',
templateUrl: './app-menu.component.html', templateUrl: './app-menu.component.html',
styleUrls: ['./app-menu.component.scss'], styleUrls: ['./app-menu.component.scss']
standalone: false
}) })
export class AppMenuComponent implements OnInit { export class AppMenuComponent implements OnInit {
@@ -33,4 +33,5 @@ export class AppMenuComponent implements OnInit {
deActivateRoute() { deActivateRoute() {
this.noContent=true; this.noContent=true;
} }
} }
@@ -1,51 +1,47 @@
<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]">
@if ((user|async)==null) { <span *ngIf="(user|async)==null" i18n>Sign in</span>
<span i18n>Sign in</span> <span *ngIf="(user|async)!=null" i18n>To app</span>
} </a>
@if ((user|async)!=null) { </div>
<span i18n>To app</span> </div>
} </nav>
</a> <div class="body">
</div> <router-outlet></router-outlet>
</div> </div>
</nav> <fm-menu-background [visible]="menuVisible|async"></fm-menu-background>
<div class="body"> <fm-side-panel [visible]="menuVisible|async" [left]="true" class="menu" (click)="handleStopBubble($event)">
<router-outlet></router-outlet> <div class="container-fluid">
</div> <div class="body">
<fm-menu-background [visible]="menuVisible|async"></fm-menu-background> <div class="d-flex flex-row">
<fm-side-panel [visible]="menuVisible|async" [left]="true" class="menu" (click)="handleStopBubble($event)"> <div class="mt-2 mb-2 flex-grow-1 logo" (click)="handleHome($event)"><router-outlet name="side-panel-logo"></router-outlet></div>
<div class="container-fluid"> <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="body"> </div>
<div class="d-flex flex-row"> <div class="d-flex flex-column cards">
<div class="mt-2 mb-2 flex-grow-1 logo" (click)="handleHome($event)"><router-outlet name="side-panel-logo"></router-outlet></div> <router-outlet name="side-panel-menu"></router-outlet>
<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"> </div>
<router-outlet name="side-panel-menu"></router-outlet> </fm-side-panel>
</div> <ng-container *ngIf="showUploadProgress">
</div> <fm-resumable-file-upload></fm-resumable-file-upload>
</div> </ng-container>
</fm-side-panel> <div class="user-menu apponly">
@if (showUploadProgress) { <fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async" [backgroundColor]="settingMenuBackgroundColor|async"></fm-setting-menu>
<fm-resumable-file-upload></fm-resumable-file-upload> <fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
} <fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
<div class="user-menu apponly"> <fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>
<fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async" [backgroundColor]="settingMenuBackgroundColor|async"></fm-setting-menu> <fm-user-menu [user]="user|async" [showMenu]="accountMenuVisible|async"></fm-user-menu>
<fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu> </div>
<fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu> <div class="healthstatus-container online apponly" [ngClass]="{'online' :(isOnline|async)}">
<fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu> <div class="healthstatus alert alert-danger m-0" >
<fm-user-menu [user]="user|async" [showMenu]="accountMenuVisible|async"></fm-user-menu> <span i18n>Not connected, make sure your device has an active internet connection</span>
</div> </div>
<div class="healthstatus-container online apponly" [ngClass]="{'online' :(isOnline|async)}"> </div>
<div class="healthstatus alert alert-danger m-0" > </div>
<span i18n>Not connected, make sure your device has an active internet connection</span>
</div>
</div>
</div>
@@ -1,6 +1,6 @@
import { Component, OnInit, OnDestroy, Inject, Optional, ViewEncapsulation, RendererFactory2, PLATFORM_ID, ChangeDetectionStrategy, HostListener, Input, DOCUMENT } from '@angular/core'; import { Component, OnInit, OnDestroy, Inject, Optional, ViewEncapsulation, RendererFactory2, PLATFORM_ID, ChangeDetectionStrategy, HostListener, Input } 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 { Meta, Title, MetaDefinition } from '@angular/platform-browser'; import { DOCUMENT } from "@angular/common";
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';
@@ -20,12 +20,11 @@ import { AppConfig } from '../../shared/app.config';
import * as appReducers from '../../reducers/app-common.reducer'; import * as appReducers from '../../reducers/app-common.reducer';
@Component({ @Component({
selector: 'fm-app', selector: 'fm-app',
templateUrl: './app.component.html', templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'], styleUrls: ['./app.component.scss'],
encapsulation: ViewEncapsulation.None, encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush
standalone: false
}) })
export class AppComponent implements OnInit, OnDestroy { export class AppComponent implements OnInit, OnDestroy {
@@ -3,10 +3,9 @@ import { Router } from '@angular/router';
import { OAuthService } from 'angular-oauth2-oidc'; import { OAuthService } from 'angular-oauth2-oidc';
import { Location} from '@angular/common'; import { Location} from '@angular/common';
@Component({ @Component({
selector: 'fm-auth-callback', selector: 'fm-auth-callback',
template: '<div></div>', template:'<div></div>'
standalone: false
}) })
export class AuthCallbackComponent { export class AuthCallbackComponent {
@@ -3,10 +3,9 @@ import { IUser } from '../../models/user';
import { AppConfig } from '../../shared/app.config'; import { AppConfig } from '../../shared/app.config';
@Component({ @Component({
selector: 'fm-avatar', selector: 'fm-avatar',
templateUrl: './avatar.component.html', templateUrl: './avatar.component.html',
styleUrls: ['./avatar.component.css'], styleUrls: ['./avatar.component.css']
standalone: false
}) })
export class AvatarComponent implements OnInit { export class AvatarComponent implements OnInit {
@@ -1,5 +1,4 @@
@if (show()) { <div *ngIf="show()" class="back-button mb-2">
<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>
}
@@ -3,10 +3,9 @@ import { Component, EventEmitter, HostListener, Output } from '@angular/core';
import { DeviceService } from '../../services/device.service'; import { DeviceService } from '../../services/device.service';
@Component({ @Component({
selector: 'fm-back-button', selector: 'fm-back-button',
templateUrl: './back-button.component.html', templateUrl: './back-button.component.html',
styleUrls: ['./back-button.component.scss'], styleUrls: ['./back-button.component.scss']
standalone: false
}) })
export class BackButtonComponent { export class BackButtonComponent {
@Output() beforeLocationBack = new EventEmitter(); @Output() beforeLocationBack = new EventEmitter();
@@ -5,34 +5,32 @@
<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">
@if (!isImageLoaded) { <div *ngIf="!isImageLoaded" class="no-image" (click)="fileInput.click()">
<div class="no-image" (click)="fileInput.click()"> <i class="fal fa-image"></i>
<i class="fal fa-image"></i> <div i18n>No image selected</div>
<div i18n>No image selected</div> </div>
</div> <image-cropper #imageCropper output="base64"
} [imageChangedEvent]="imageChangedEvent"
<image-cropper #imageCropper output="base64" [maintainAspectRatio]="true"
[imageChangedEvent]="imageChangedEvent" [format]="imageType"
[maintainAspectRatio]="true" [aspectRatio]="aspectRatio"
[format]="imageType" [autoCrop]="true"
[aspectRatio]="aspectRatio" [resizeToWidth]="maxWidth"
[autoCrop]="true" [roundCropper]="roundImage"
[resizeToWidth]="maxWidth" (imageCropped)="imageCropped($event)"
[roundCropper]="roundImage" (imageLoaded)="imageLoaded($event)"
(imageCropped)="imageCropped($event)" (cropperReady)="cropperReady()"
(imageLoaded)="imageLoaded($event)" (loadImageFailed)="loadImageFailed()"
(cropperReady)="cropperReady()" [imageURL]="imageUrl"
(loadImageFailed)="loadImageFailed()" ></image-cropper>
[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>
@@ -5,10 +5,9 @@ import { ImageCroppedEvent,LoadedImage } from 'ngx-image-cropper';
import {ImageService } from '../../services/image.service'; import {ImageService } from '../../services/image.service';
@Component({ @Component({
selector: 'fm-edit-image-modal', selector: 'fm-edit-image-modal',
templateUrl: './edit-image-modal.component.html', templateUrl: './edit-image-modal.component.html',
styleUrls: ['./edit-image-modal.component.scss'], styleUrls: ['./edit-image-modal.component.scss']
standalone: false
}) })
export class EditImageModalComponent implements OnInit { export class EditImageModalComponent implements OnInit {
@@ -1,28 +1,16 @@
@if (gradientItems) { <div *ngIf="gradientItems" class="form-control gradient-select" (click)="handleToggleList()">
<div class="form-control gradient-select" (click)="handleToggleList()"> <div *ngIf="selectedItem">
@if (selectedItem) { <div *ngIf="showLabel">{{selectedItem?.name}}</div>
<div> <fm-gradient [gradientItem]="selectedItem"></fm-gradient>
@if (showLabel) {
<div>{{selectedItem?.name}}</div>
}
<fm-gradient [gradientItem]="selectedItem"></fm-gradient>
</div>
}
<div class="gradient-list" [ngClass]="{'visible':listVisible}">
@if (gradientItems) {
<ul>
@for (item of gradientItems; track item) {
<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>
}
</ul>
}
@if (showAdd) {
<div class="addGradient"><a href="#" i18n (click)="handleAdd($event)" >Add gradient</a></div>
}
</div> </div>
</div> <div class="gradient-list" [ngClass]="{'visible':listVisible}">
} <ul *ngIf="gradientItems">
<li *ngFor="let item of gradientItems" (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>
</ul>
<div *ngIf="showAdd" class="addGradient"><a href="#" i18n (click)="handleAdd($event)" >Add gradient</a></div>
</div>
</div>
@@ -2,10 +2,9 @@ import { Component, ChangeDetectorRef, Input,SimpleChanges,OnChanges, Output,Eve
import { IItem } from '../../models/item'; import { IItem } from '../../models/item';
@Component({ @Component({
selector: 'fm-gradient-select', selector: 'fm-gradient-select',
templateUrl: './gradient-select.component.html', templateUrl: './gradient-select.component.html',
styleUrls: ['./gradient-select.component.scss'], styleUrls: ['./gradient-select.component.scss']
standalone: false
}) })
export class GradientSelectComponent implements OnChanges { export class GradientSelectComponent implements OnChanges {
@@ -6,10 +6,9 @@ import { GradientService } from '../../common-service.module';
@Component({ @Component({
selector: 'fm-gradient', selector: 'fm-gradient',
templateUrl: './gradient.component.html', templateUrl: './gradient.component.html',
styleUrls: ['./gradient.component.scss'], styleUrls: ['./gradient.component.scss']
standalone: false
}) })
export class GradientComponent implements OnInit,OnChanges { export class GradientComponent implements OnInit,OnChanges {
@@ -7,9 +7,8 @@ import { skip } from 'rxjs/operators';
import {OAuthService } from 'angular-oauth2-oidc'; import {OAuthService } from 'angular-oauth2-oidc';
import { IUser } from '../../models/user'; import { IUser } from '../../models/user';
@Directive({ @Directive({
selector: '[fm-hasclaim]', selector: '[fm-hasclaim]',
standalone: false
}) })
export class HasClaimDirective implements OnInit{ export class HasClaimDirective implements OnInit{
@Input('fm-hasclaim') claim:string; @Input('fm-hasclaim') claim:string;
@@ -4,9 +4,8 @@ import {PackageService} from '../../services/package.service';
import * as appCommonReducer from '../../reducers/app-common.reducer'; import * as appCommonReducer from '../../reducers/app-common.reducer';
import {Store} from '@ngrx/store'; import {Store} from '@ngrx/store';
@Directive({ @Directive({
selector: '[fmHasPackage]', selector: '[fmHasPackage]',
standalone: false
}) })
export class HasPackageDirective implements OnDestroy, AfterViewInit { export class HasPackageDirective implements OnDestroy, AfterViewInit {
@@ -5,8 +5,7 @@ import { Observable, Subscription } from 'rxjs';
import { IUser } from '../../models/user'; import { IUser } from '../../models/user';
@Directive({ @Directive({
selector: '[fmHasRole]', selector: '[fmHasRole]',
standalone: false
}) })
export class HasRoleDirective implements OnInit, OnDestroy{ export class HasRoleDirective implements OnInit, OnDestroy{
@Input('fmHasRole') role:string; @Input('fmHasRole') role:string;

Some files were not shown because too many files have changed in this diff Show More