Compare commits

...

731 Commits

Author SHA1 Message Date
Willem Dantuma 34b067fd28 Add jenkins file for master
FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-06-03 09:37:13 +02:00
Willem Dantuma fb9a046ff8 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-06-03 09:34:11 +02:00
Willem Dantuma c4934d799d release 1.0.0 2021-06-03 09:34:03 +02:00
Wilco Krikke 469bc6f1c1 AW-2390
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-06-02 16:39:33 +02:00
Wilco Krikke d140d4bd4c AW-2390
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-05-27 19:44:29 +02:00
Peter Bastiani 1ce259a152 Add %
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-05-26 16:34:04 +02:00
Peter Bastiani 00ae86ecf2 AW-2388
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-05-26 16:11:21 +02:00
Peter Bastiani 880eb26a99 getPercentage
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-05-26 14:59:03 +02:00
Peter Bastiani bcfa13de60 AW-2388 Fixed mixed decimal in histogram 2021-05-26 14:58:03 +02:00
Willem Dantuma 6f77df0f61 Fix AW-2361
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-05-25 22:12:32 +02:00
Mark van der Wal fbe0413c6a Merge branch 'feature/AW-2268' into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-05-18 13:05:16 +02:00
Mark van der Wal 115f53e93c AW-2268 fix .fullscreen .control-container 2021-05-18 09:49:50 +02:00
Mark van der Wal ca40ca0927 renamed package guard and added it to public api 2021-05-17 14:23:44 +02:00
Peter Bastiani 29968a736c Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-05-06 14:05:49 +02:00
Peter Bastiani 077afcb0d7 Fix validToday 2021-05-06 14:05:43 +02:00
Willem Dantuma 6e79afd115 Logout on deleteuser event
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-05-05 18:56:53 +02:00
Peter Bastiani 4f9cdf1588 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-05-04 16:23:00 +02:00
Peter Bastiani fa69dee550 Fix expected selector /deep/ 2021-05-04 16:22:46 +02:00
Willem Dantuma 06e353ee94 Reverse /deep/
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-05-04 16:21:57 +02:00
Peter Bastiani 8d723477d3 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-05-04 11:28:49 +02:00
Peter Bastiani 771e388f0e AW-2081 Align avatar 2021-05-04 11:28:43 +02:00
Willem Dantuma 040b5b8c4d Cancel only not allready uploaded files
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-05-03 19:00:20 +02:00
Peter Bastiani 3504990708 Add ability to retrieve only items that are valid today.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-04-30 10:36:58 +02:00
Peter Bastiani 798ec8d1ca Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-04-29 14:06:41 +02:00
Peter Bastiani 8f5dd0969c casing 2021-04-29 14:06:35 +02:00
Willem Dantuma 861a8a48fc Add dataFilter to children/count
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-04-29 13:49:38 +02:00
Peter Bastiani 86a545d7e6 Add IUser.newsLetter
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-04-29 10:29:31 +02:00
Willem Dantuma 8a1c4b5e20 Only show prent namewhen of type ..cropfield
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-04-26 08:01:43 +02:00
Peter Bastiani b24e47e39b AW-2214 Fix refactored itemtype.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-04-23 10:54:52 +02:00
Peter Bastiani c0d8e6d615 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-04-23 10:50:50 +02:00
Peter Bastiani 7192f66420 AW-2211 Update *fmHasPackage directive 2021-04-23 10:50:45 +02:00
Willem Dantuma dcc24aa149 Fix setExtent
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-04-19 08:43:20 +02:00
Willem Dantuma 0485c163ad Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-04-12 15:55:38 +02:00
Willem Dantuma 1380d7169a Fix trigger
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-04-12 15:52:42 +02:00
Willem Dantuma a6d3b208b0 Hide buttons when no routing to sink
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-04-12 15:10:29 +02:00
Willem Dantuma cbf805e1ff Fix novalue
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-20 20:29:27 +01:00
Willem Dantuma 8907dca091 Set color default to no value color
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-20 20:07:31 +01:00
Willem Dantuma fe1fddd211 Update layer
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-20 18:35:22 +01:00
Willem Dantuma fa146f2c6e Refactor fmMapIfZoomToShow
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-20 18:26:01 +01:00
Willem Dantuma c9fac05aa6 Refactor to fm-map-feature-thumbnail
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-20 12:00:04 +01:00
Willem Dantuma 75d8909997 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-20 11:29:08 +01:00
Willem Dantuma 36d9c98e47 Clear view
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-03-20 11:25:23 +01:00
Willem Dantuma e2255164fc Run npm audit fix 2021-03-20 11:09:26 +01:00
Willem Dantuma 4c5b77000f Update libs 2021-03-20 11:08:54 +01:00
Willem Dantuma 997ebb24a7 Implement then else for haspackage
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-20 11:06:04 +01:00
Wilco Krikke 00346a963e Pfff
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-17 19:33:54 +01:00
Wilco Krikke a42059627a Added level to get features call
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-03-16 21:30:20 +01:00
Willem Dantuma 5b710ce200 Refactor getcolor
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-15 16:26:05 +01:00
Willem Dantuma f8a0e1e167 Add SetUnreadNotifications action
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-08 08:45:13 +01:00
Willem Dantuma eb46b3496a Fix type check
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-06 14:29:01 +01:00
Willem Dantuma e8bbb74185 Fix temporal and initial loading
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-06 14:06:31 +01:00
Willem Dantuma 3d8ce7ee74 Fix null check
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-05 19:03:50 +01:00
Willem Dantuma aa308abbb0 Fix request canceling
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-05 18:41:09 +01:00
Willem Dantuma 9d5cd0fa88 Add layer values
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-05 17:19:30 +01:00
Willem Dantuma 5760c2b8ea oops
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-05 12:40:52 +01:00
Willem Dantuma 1e6c9e9363 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-03-05 12:39:41 +01:00
Willem Dantuma 8f06a56e52 Add ngx-clipboard
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-03-05 12:37:10 +01:00
Willem Dantuma 2f74f43c8e Add getLayerValue
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-05 11:10:39 +01:00
Willem Dantuma c093ffae50 run npm audit fix 2021-03-05 07:52:05 +01:00
Willem Dantuma c7da0866ef Fix mime type
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-02 17:21:54 +01:00
Willem Dantuma b000d5119a Return correct file
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-02 16:51:16 +01:00
Peter Bastiani 2dd10f04a3 Return selected file as well
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-02 15:36:01 +01:00
Peter Bastiani 4d62184e5b Revert "Return modal reference for client side handling."
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
This reverts commit 8ad9d56b07.
2021-03-02 15:13:42 +01:00
Peter Bastiani 8ad9d56b07 Return modal reference for client side handling.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-02 14:48:49 +01:00
Willem Dantuma 2b1cb1ac8f Add save image parameter
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-02 13:15:16 +01:00
Willem Dantuma 08163f86bf Add more open options
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-02 12:20:53 +01:00
Willem Dantuma 33adb35923 Export image editor
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-02 09:35:39 +01:00
Willem Dantuma 855bd8fe2d Re add thumbnail component
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-02 08:16:16 +01:00
Willem Dantuma fad257c6e2 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-02 08:13:07 +01:00
Willem Dantuma e262f7c65d Merge branch 'feature/thumbnail_upload' into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-03-02 08:10:10 +01:00
Willem Dantuma cabdeaa875 Reload image on change 2021-03-02 08:09:42 +01:00
Willem Dantuma 2f1c5210ea Save image 2021-03-01 22:03:18 +01:00
Willem Dantuma 47f3238edd Add no-image placeholder 2021-03-01 17:25:40 +01:00
Willem Dantuma 01488ae2e0 Remove background color 2021-03-01 17:01:57 +01:00
Willem Dantuma ae02dd0b53 Merge branch 'develop' into feature/thumbnail_upload 2021-03-01 16:57:15 +01:00
Willem Dantuma 7768387f58 Basic edit-image-modal 2021-03-01 16:56:48 +01:00
Peter Bastiani 3c0f220ee3 Span required instead of div
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-01 12:49:12 +01:00
Peter Bastiani 38e64a0713 Fix
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-03-01 12:38:16 +01:00
Peter Bastiani 0bb5406773 AW-1881
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-03-01 12:32:14 +01:00
Peter Bastiani 7c125f1771 AW-1881
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-27 14:47:16 +01:00
Peter Bastiani 3673e0b349 Fixes
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-27 10:27:49 +01:00
Peter Bastiani ece6096064 AW-1881 Avatar
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-27 10:16:07 +01:00
Willem Dantuma dd71b49502 Merge branch 'develop' into feature/thumbnail_upload
# Conflicts:
#	package-lock.json
#	projects/common/src/fm/common.module.ts
2021-02-25 20:18:59 +01:00
Willem Dantuma a098f72b1a Start of thumbnail upload dialog 2021-02-25 19:57:09 +01:00
Peter Bastiani 535f6bd064 Add ngx avatar
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-25 17:32:58 +01:00
Peter Bastiani 74e7f41583 Added avatar
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-02-25 17:17:52 +01:00
Peter Bastiani b537239c96 AW-1881 Avatar based on first letters of firstname and lastname
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-18 16:09:25 +01:00
Peter Bastiani f9ba4fd5e2 Revert "Update version"
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
This reverts commit 8326255ce9.
2021-02-17 12:30:54 +01:00
Peter Bastiani 8326255ce9 Update version
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-17 12:27:13 +01:00
Peter Bastiani 3d60d0127b AW-1959 Fix?
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-16 17:23:15 +01:00
Peter Bastiani 697708710e Fix help-menu.component.ts
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-16 17:07:40 +01:00
Peter Bastiani 102d96ded9 AW-1959 Add global help-menu
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-16 16:49:23 +01:00
Willem Dantuma f802f41bbb Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-15 11:34:27 +01:00
Willem Dantuma d134240b8b Add fm-thumbnail component 2021-02-15 11:34:21 +01:00
Francisco Salas 3242058c4f refactor user api
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-15 11:03:24 +01:00
Mark van der Wal 3f6863845b renamed package guard and added it to public api
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-11 17:43:19 +01:00
Willem Dantuma 231fbf9ee8 Add test
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-11 11:49:28 +01:00
Willem Dantuma 142a1c9e58 Add notification menu
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-11 11:44:34 +01:00
Mark van der Wal 39993e75da added a package guard
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-05 12:51:43 +01:00
Willem Dantuma b7b168dffb Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-03 17:28:42 +01:00
Willem Dantuma fb9c11fce6 Some fixes update libs 2021-02-03 17:28:35 +01:00
Francisco Salas da562ca96d fix
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-03 09:13:08 +01:00
Francisco Salas 33d03c3d58 add searchable field to user
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-02-03 09:02:58 +01:00
Willem Dantuma 335078a10c Fix header
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-02 17:38:34 +01:00
Willem Dantuma bb71c043a1 Fix headers
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-02 17:25:26 +01:00
Willem Dantuma cb222770d8 Refactor to range requests
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-02 17:09:03 +01:00
Willem Dantuma f26ececb9b Fix nullref
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-02 14:45:33 +01:00
Willem Dantuma 2d285eaba0 Fix device change detection
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-01 08:43:33 +01:00
Willem Dantuma d9a42ca75a Hide heading and tolerance on desktop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-01 08:34:17 +01:00
Willem Dantuma 0c44beabe0 Change map button styling
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-30 16:40:25 +01:00
Willem Dantuma dd97c89254 Fix outlet
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-30 14:41:34 +01:00
Willem Dantuma 45de27f666 Add haspackage for 3d
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-30 11:14:25 +01:00
Willem Dantuma 5b0632ebf1 Re enable gps location
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-30 10:51:45 +01:00
Willem Dantuma 8389943d1a update to ol 6.5.0 and ol-cesium 2.12.0
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-30 10:20:17 +01:00
Willem Dantuma 2606de5f0a Fix side panel display logic
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-30 09:56:56 +01:00
Willem Dantuma 208dfed7fb Add checks
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-29 12:42:19 +01:00
Willem Dantuma eb50218a8d Refactor some stuff to a service
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-29 12:00:59 +01:00
Willem Dantuma 516d63a59e Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-29 11:33:22 +01:00
Willem Dantuma 321d34870e Add zoom to show alert
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-01-29 11:25:37 +01:00
Willem Dantuma dbc330ab46 Move side panels to map context to get access to map 2021-01-29 10:10:13 +01:00
Willem Dantuma 154bcba620 Implement *fm-map-ifZoomToShowdirective 2021-01-29 10:04:47 +01:00
Willem Dantuma 2f5ffde4d9 More updates
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-27 21:43:46 +01:00
Willem Dantuma 69e153abd7 upgrade
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-27 21:32:31 +01:00
Willem Dantuma 669c724e3a Fix styling app and user menu on mobile device
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-27 10:33:01 +01:00
Willem Dantuma a7402438a0 oops
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-27 08:14:13 +01:00
Willem Dantuma dda82c8b09 Add device service migrate, use back-button
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-01-27 08:11:37 +01:00
Willem Dantuma 3e14157e87 Adjust bottom margin 2021-01-27 07:53:59 +01:00
Willem Dantuma 1e84874695 Export back-button
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-27 07:34:10 +01:00
Willem Dantuma 9245003dd9 Export back-button
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-27 07:26:31 +01:00
Willem Dantuma 8d061210dc Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-27 07:15:11 +01:00
Willem Dantuma 8a40335cf2 Fix build 2021-01-27 07:11:06 +01:00
Willem Dantuma ce9c72016d Add back button
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-01-27 07:08:31 +01:00
Willem Dantuma a082967c69 Add getItemFeature method
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-26 19:53:51 +01:00
Willem Dantuma a2e7439776 re add Optimisation
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-26 17:48:11 +01:00
Willem Dantuma e858ac778c Fix temporal layer selection
FarmMaps.Develop/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details
2021-01-26 17:47:17 +01:00
Willem Dantuma 290d5d1d26 Fix eventhandler install for temporal
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-26 17:07:45 +01:00
Willem Dantuma e75afdc01d Fix destroy and eventhandler install
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-26 16:47:08 +01:00
Willem Dantuma 8f54e095fe debug
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-26 15:27:40 +01:00
Willem Dantuma 431cc78c19 remove layer when destroyed
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-26 14:38:40 +01:00
Willem Dantuma 878944b056 Export temporal item layer
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-26 09:59:02 +01:00
Willem Dantuma d2b8de17d1 Fix hover and select remove @Host()
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-26 09:12:37 +01:00
Willem Dantuma ac352473a0 add i18n tag
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-25 21:14:47 +01:00
Willem Dantuma 8655307858 Fix date
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-25 21:11:20 +01:00
Willem Dantuma 17a947ce20 Oops
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-25 20:32:52 +01:00
Willem Dantuma fe356441d0 Use timespan for temporal items
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-01-25 20:30:13 +01:00
Willem Dantuma b17bce1cd2 Add default unitScale
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-25 20:18:04 +01:00
Willem Dantuma bb555eec74 Remove fill colors for selected items 2021-01-25 18:28:26 +01:00
Willem Dantuma d3c28847ec Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
# Conflicts:
#	projects/common-map/src/fm-map/components/aol/layer-list/layer-list.component.html
2021-01-25 17:26:59 +01:00
Willem Dantuma e2499d0403 Fix icons 2021-01-25 17:26:15 +01:00
Mark van der Wal 8f364c4990 fix bar-chart icon
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-25 11:42:57 +01:00
Willem Dantuma 46f4ac06f4 Fix icons
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-24 11:08:41 +01:00
Willem Dantuma b5d42d855e Fix spacing and up down icon
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-24 09:26:30 +01:00
Willem Dantuma b14b01b358 Update icons
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-24 09:09:43 +01:00
Willem Dantuma 08acba9a88 Merge branch 'feature/vectortileselect' into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-23 18:41:44 +01:00
Willem Dantuma b30c29a5f1 Some fixes and optimizations 2021-01-23 18:30:29 +01:00
Willem Dantuma 2f4e14ca1f Merge branch 'develop' into feature/vectortileselect 2021-01-23 17:28:24 +01:00
Willem Dantuma bfcdcce9ef Fix fontawesome class names
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-22 14:52:10 +01:00
Willem Dantuma 9e3e7d5d47 Upgrade to fontawesom 5.15.2 2021-01-22 13:13:48 +01:00
Willem Dantuma 2949e39fcd wip 2021-01-22 12:26:14 +01:00
Willem Dantuma 9376c236aa Merge branch 'develop' into feature/vectortileselect
# Conflicts:
#	package-lock.json
#	package.json
2021-01-21 11:04:57 +01:00
Willem Dantuma a1079eb21f update libs
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-21 11:04:22 +01:00
Willem Dantuma c266ce7d42 Update libs 2021-01-21 11:03:37 +01:00
Peter Bastiani 428e3b002d Fix UTC
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-18 16:45:37 +01:00
Peter Bastiani 65366ff09b Again....
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-18 15:23:44 +01:00
Peter Bastiani 0f1ce45b2f AW-1844 Fix fmHasPackage
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-01-18 15:21:34 +01:00
Peter Bastiani 1ade8025ab Fix HasPackageDirective
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-01-18 15:01:08 +01:00
Willem Dantuma ac8815e8f1 Commit 2021-01-13 17:33:01 +01:00
Peter Bastiani 41b1295f9e Move mollie code ( srvice ) uit farmmapslib halen ( is open source ), naar farmmaps
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-13 17:29:48 +01:00
Peter Bastiani ed5a74ed07 Export new Mollie types
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-13 17:18:45 +01:00
Peter Bastiani a08eed7c67 AW-1805 Update mollie service (client)
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-13 16:40:35 +01:00
Peter Bastiani cc421742df AW-1805 Add support for validity
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-12 09:05:27 +01:00
Peter Bastiani 9a38630d01 Fix URL
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-11 19:50:24 +01:00
Peter Bastiani 978360fad0 Build error
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-01-11 19:34:39 +01:00
Peter Bastiani 30dab68468 AW-1805 Add mollie service
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2021-01-11 19:32:08 +01:00
Willem Dantuma 80fec7ccaa Some fixes 2020-12-18 20:16:22 +01:00
Willem Dantuma 1a1cd7a81c Merge branch 'develop' into feature/vectortileselect 2020-12-18 19:22:33 +01:00
Mark van der Wal a782d8ebe9 add clearlayers action
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-12-16 23:01:59 +01:00
Willem Dantuma a0816afaea Add SetSelectedItemLayer action
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-12-16 18:04:39 +01:00
Willem Dantuma 6746047fe2 Add setfeatures action
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-12-11 13:35:51 +01:00
Willem Dantuma 7266c98a10 Add router-outlet to map component to make it more reusable
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-12-11 12:08:15 +01:00
Willem Dantuma e873f5af5b Fix icon
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-12-09 23:39:44 +01:00
Willem Dantuma 44f476d5fd Add app-menu 2020-12-09 21:45:38 +01:00
Willem Dantuma 200f3e95eb Dont's show blank screen 2020-12-09 20:35:01 +01:00
Willem Dantuma 1a8bc43c60 Remove horizontal scrollbar
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-12-09 15:23:50 +01:00
Willem Dantuma 6dccaa8ce5 Wait for item types to be loaded
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-12-08 16:14:58 +01:00
Willem Dantuma f2cb5d4d64 Update configuration
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-12-07 17:20:34 +01:00
Francisco Salas 6252cc120b aw-1686 expand user profile; added put operation
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-11-18 15:07:39 +01:00
Willem Dantuma 03284d26dd Merge branch 'develop' into feature/vectortileselect 2020-11-06 08:59:08 +01:00
Peter Bastiani 946cbc6533 AQ-1659 Add getItemListUsingRelationship(...)
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-11-05 17:44:39 +01:00
Willem Dantuma 6277236993 Merge branch 'develop' into feature/vectortileselect 2020-11-03 20:22:25 +01:00
Willem Dantuma 20bda6b81f Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-11-03 20:21:39 +01:00
Willem Dantuma 9a338c04e6 Basic working implementation 2020-11-03 20:21:18 +01:00
Peter Bastiani 65c1643c95 AW-1649 Remove codelistitem
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-11-03 13:05:59 +01:00
Willem Dantuma 9cbc9f1293 Implement event handlers 2020-11-02 21:00:13 +01:00
Willem Dantuma 34b75a4c18 Upgrade openlayers 2020-11-02 20:58:32 +01:00
Willem Dantuma 1991e79ed2 Add landingpage and lazyloading voor 3d map
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-11-02 12:24:15 +01:00
Willem Dantuma d661e5f3f9 Fix zoom padding
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-11-01 15:35:38 +01:00
Willem Dantuma 0a384a9196 Fix zoomto padding 2020-11-01 15:34:01 +01:00
Willem Dantuma 0e13b98b7f Detect changes
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-31 16:58:03 +01:00
Willem Dantuma 56a7544c1e Make reverse non destructive
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-31 13:43:31 +01:00
Willem Dantuma 61636b6e3d Reverse arrays
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-31 13:38:27 +01:00
Willem Dantuma ab835e904e Fix routes
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-31 11:45:03 +01:00
Willem Dantuma cd10165510 Remove old init
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-30 13:12:13 +01:00
Willem Dantuma 446d26607c Fix initalisation
FarmMaps.Develop/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details
2020-10-30 13:11:20 +01:00
Willem Dantuma 8d204ce1cd Some fixes
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-30 12:37:02 +01:00
Willem Dantuma 2656a67fca Refactor token refresh flows
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-30 08:22:58 +01:00
Willem Dantuma 46c5f74b49 Refactoring for landingpage support
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-29 19:14:06 +01:00
Willem Dantuma a5ece9b453 Fix map viewport size
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-28 17:54:46 +01:00
Willem Dantuma 9fb5a9698c Refactor map component
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-28 13:31:12 +01:00
Francisco Salas fad2f19ae4 added readWrite property for codeListItem
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-13 08:38:23 +02:00
Mark van der Wal 2ad04fc7c1 Added getCodeListItem api for service
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-12 17:41:24 +02:00
Francisco Salas f656ecd23f undo previous commit
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-12 14:05:27 +02:00
Francisco Salas d42aad87bd Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-10 12:02:34 +02:00
Francisco Salas 415ee8ef30 something weird, codeList item in url seems empty. But item is not empty 2020-10-10 12:00:05 +02:00
Willem Dantuma 306065dcbd Fix logout issue
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-09 16:35:14 +02:00
Francisco Salas 824ba97704 try to fix deleteCodeListItem
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-09 07:47:47 +02:00
Francisco Salas ac8ab147bc added codelist service
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-08 14:25:33 +02:00
Willem Dantuma 640c99cde2 Add test component
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-06 09:07:40 +02:00
Willem Dantuma da2492e017 Add fm-gradient-select
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-06 08:22:10 +02:00
Willem Dantuma f93d235877 add fm-gradient component
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-05 14:58:47 +02:00
Willem Dantuma fe798e3f60 Fix AW-1508
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-05 11:08:36 +02:00
Willem Dantuma b8dcc4e9e0 Add 3D example to test app
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-02 17:48:34 +02:00
Willem Dantuma 4b6175b6c4 Add npm scope
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-02 17:37:36 +02:00
Willem Dantuma 388a2faf84 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-02 17:33:25 +02:00
Willem Dantuma 0b0bb4d598 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-10-02 17:26:18 +02:00
Willem Dantuma 7696ddd8d2 Add common-map3d to jenkins build
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-10-02 17:23:11 +02:00
Willem Dantuma 1301a9d082 Merge branch 'feature/Resurect_3D' into develop 2020-10-02 17:21:01 +02:00
Willem Dantuma e87affee08 Refactor 3d to own library 2020-10-02 17:20:00 +02:00
Willem Dantuma b00b21e6b8 Merge branch 'develop' into feature/Resurect_3D 2020-10-02 16:44:11 +02:00
Willem Dantuma 835851350c Fix i18n tags
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-10-02 07:46:59 +02:00
Willem Dantuma 7bdb48b644 Fix signalr authentication
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-30 18:30:36 +02:00
Willem Dantuma 84d6f44e9b Fix transition
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-29 20:57:14 +02:00
Willem Dantuma 2fd109d967 Fix AW-1414
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-29 15:27:21 +02:00
Willem Dantuma f9934ccf27 Fix AW-1355
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-29 14:56:23 +02:00
Willem Dantuma b93218e165 Merge branch 'develop' into feature/Resurect_3D
# Conflicts:
#	angular.json
#	package-lock.json
#	package.json
#	projects/common-map/package.json
2020-09-26 12:17:58 +02:00
Willem Dantuma 8e55308df9 First working angular 10 version
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-26 10:10:38 +02:00
Willem Dantuma 5270739641 Fix versions
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-26 10:03:15 +02:00
Willem Dantuma ce8e8fa706 Update common
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-09-25 21:24:54 +02:00
Willem Dantuma d326a82c4e Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-09-25 21:18:04 +02:00
Willem Dantuma c1683a058c Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-09-25 21:16:38 +02:00
Willem Dantuma aa168bb3a1 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-09-25 19:55:08 +02:00
Willem Dantuma fe53955bea Try to fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-09-25 19:47:39 +02:00
Willem Dantuma ba3dad1365 Fix dep
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-09-25 19:38:47 +02:00
Willem Dantuma 6d2d259c01 Merge branch 'feature/angular_upgrade_10' into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-09-25 19:28:18 +02:00
Willem Dantuma 92774647ff Upgrade to angular 10 2020-09-25 19:27:53 +02:00
Willem Dantuma 9ca047923f npm auit fix 2020-09-25 17:10:17 +02:00
Willem Dantuma c893a2820b Fix responsetype
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-22 19:29:44 +02:00
Willem Dantuma baa0166fc8 Stupid bug :-(
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-22 15:13:00 +02:00
Willem Dantuma 58c200aca0 Another attempt to fix parameter
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-22 15:03:23 +02:00
Willem Dantuma b8a4b3541d Fix params
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-22 14:46:51 +02:00
Willem Dantuma 584a1514ac Add getItemData
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-22 13:58:33 +02:00
Willem Dantuma 21af6ab2c4 Some styling fixes 2020-09-18 17:19:29 +02:00
Willem Dantuma c606e02673 Fix static image layer 2020-09-18 16:05:44 +02:00
Willem Dantuma ff4eb296ff Update libs
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-18 14:50:17 +02:00
Willem Dantuma ea26cdd628 Update libs
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-18 14:30:20 +02:00
Willem Dantuma 26e28bdda8 Revert changes 2020-09-18 14:29:50 +02:00
Willem Dantuma 15d1f14ee1 More or less working now 2020-09-18 14:20:33 +02:00
Willem Dantuma 22e007b70b First attempt to bring back 3D view in map 2020-09-18 08:38:05 +02:00
Willem Dantuma 9e4a538a07 Implement min/maxzoom on vectorlayer
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-16 20:09:52 +02:00
Willem Dantuma c44c771feb Use indexKey if specified
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-16 15:02:42 +02:00
Willem Dantuma 394bbab320 Add support for alpha in legend
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-16 14:40:03 +02:00
Willem Dantuma 3008081ae8 Implement stylecache for vectorlayer
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-16 13:38:06 +02:00
Willem Dantuma 7474c00498 Fix layerindex
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-16 10:34:04 +02:00
Willem Dantuma 964bf925e7 Fix typo
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-15 15:01:20 +02:00
Willem Dantuma fb8129148d Add to module
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-15 14:01:24 +02:00
Willem Dantuma 73db03148a First attempt package preload strategy 2020-09-15 14:00:18 +02:00
Willem Dantuma 6367d3399d Implement default baselayer option
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-09 09:54:50 +02:00
Willem Dantuma ee4e7113d2 Add TileJSON interface 2020-09-09 09:47:32 +02:00
Willem Dantuma ad86e41345 Add background-color padding and border
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-04 10:40:34 +02:00
Willem Dantuma e682b375e7 Add user-menu router outlet
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-04 10:10:01 +02:00
Willem Dantuma 78425a621a Fix fm-hasclaim
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-03 12:43:55 +02:00
Mark van der Wal 1030b1c41a removed logging in weather service.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
changed moment to peerdependency.
2020-09-03 10:37:24 +02:00
Mark van der Wal 76bdad6eaf fixed build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-03 10:25:39 +02:00
Mark van der Wal ce56dd9e9f updated weather service with correct date manipulation.
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-09-03 10:19:12 +02:00
Mark van der Wal e7a53ba7b5 HourlyWeatherData time changed to string.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-02 21:32:47 +02:00
Mark van der Wal 9f1f6934ee made hourly weather data static typed.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-02 16:21:49 +02:00
Mark van der Wal 773bf3f5e7 fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-09-02 15:28:12 +02:00
Mark van der Wal cdc900d5fd fixed weather service
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-09-02 15:23:54 +02:00
Peter Bastiani 80522a3a2f Revert "AW-1435 Add links to package manager and widget manager"
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
This reverts commit 0157812357.
2020-08-17 15:53:02 +02:00
Peter Bastiani 0157812357 AW-1435 Add links to package manager and widget manager
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-17 14:19:38 +02:00
Peter Bastiani 329564d8f6 AW-1431 Oops
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-13 15:47:04 +02:00
Peter Bastiani ba2a067c8b AW-1431 Expose new property
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-08-13 15:28:30 +02:00
Peter Bastiani 4d67a656f5 AW-1431 Add InitUserSettingsRoot
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-13 13:06:28 +02:00
Peter Bastiani ad1d40cdd1 AW-1426 Add extra check.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-11 19:13:57 +02:00
Peter Bastiani 131e0eb371 Cleanup
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-11 19:03:05 +02:00
Peter Bastiani e563011099 New try
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-08-11 18:58:50 +02:00
Peter Bastiani 7c072752c8 Build fixed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-08-11 18:52:39 +02:00
Peter Bastiani 36ced002e0 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-08-11 18:50:08 +02:00
Peter Bastiani 3e1b892eef Fix build?
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-08-11 18:38:15 +02:00
Peter Bastiani f4004cf2be Revert "AW-1426 Add extra check"
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
This reverts commit a6fd052a4f.
2020-08-11 14:42:45 +02:00
Peter Bastiani d1d8723186 Rollback c028adfb77
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-08-11 14:40:04 +02:00
Peter Bastiani a6fd052a4f AW-1426 Add extra check
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-08-11 14:35:04 +02:00
Peter Bastiani cede944538 Revert "AW-1426 Remove default component if none found"
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
This reverts commit 3b3c2768d3.
2020-08-11 14:24:12 +02:00
Peter Bastiani 3b3c2768d3 AW-1426 Remove default component if none found
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-08-11 14:11:51 +02:00
Peter Bastiani 3dd19c702f Remove Trijntje
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-08-11 13:32:05 +02:00
Mark van der Wal c028adfb77 Updated statistics confidence interval.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-06 12:04:56 +02:00
Mark van der Wal 1d2caa0fe3 Updated statistics labels.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-06 09:15:31 +02:00
Willem Dantuma d7ca1512bd Add TaskProgressEvent
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-05 20:05:44 +02:00
Willem Dantuma ebe435027f Add addedfiles stream
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-05 15:49:02 +02:00
Willem Dantuma dfefa6746f Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-05 10:34:04 +02:00
Willem Dantuma c90df5c972 Fix userPackagesChanged 2020-08-05 10:33:55 +02:00
Peter Bastiani 514a91c2c7 Improved implementation to retrieve user packages.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-05 09:02:28 +02:00
Willem Dantuma ee7d1cb9a2 AW-1419
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-04 16:09:22 +02:00
Peter Bastiani 309b320534 AW-1415 Add postItemPackageTask
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-04 14:08:50 +02:00
Peter Bastiani fdfa7d3387 Typo
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-03 08:48:11 +02:00
Willem Dantuma 6785bfc3e0 Fix when not having READ rights on the parent
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-08-01 09:44:32 +02:00
Willem Dantuma c682fb9184 Fix z-index
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-31 09:51:28 +02:00
Willem Dantuma ca6ea96eae Add interfacetype VectorWFSJson
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-30 09:33:32 +02:00
Willem Dantuma 3ebc197fac Make extent nullable
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-29 08:43:17 +02:00
Mark van der Wal 52871efb09 fix for statistics
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-28 20:02:23 +02:00
Mark van der Wal f014dc9f93 now use statistics if available in band.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-28 19:05:38 +02:00
Mark van der Wal e6cda406c9 improved alignment of legend. fixed rain in weatherservice.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-25 09:57:24 +02:00
Mark van der Wal df04397b13 I info icon now placed in the top right.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-23 19:39:06 +02:00
Willem Dantuma e0b29c905c Fix height
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-23 11:48:31 +02:00
Willem Dantuma 44ae806b30 Add offline alert
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-23 11:28:07 +02:00
Willem Dantuma 78e3cf74b9 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-23 09:43:03 +02:00
Willem Dantuma 428353d379 Fix inituser flow 2020-07-23 09:42:44 +02:00
Mark van der Wal 9697e93915 convert hourly to daily with wilco's new changes for weather2.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-22 23:04:06 +02:00
Willem Dantuma e057e463bd Only on change
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-22 21:16:38 +02:00
Willem Dantuma d494a7c7d6 Implement healthcheck service
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-22 20:31:12 +02:00
Willem Dantuma e525227865 another attempt to implement on /offline
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-22 18:49:15 +02:00
Willem Dantuma 10bdd27608 Check token when going online
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-22 09:05:02 +02:00
Willem Dantuma 2790ae74e7 Mirror navigator online flag in observable state 2020-07-22 08:52:41 +02:00
Willem Dantuma 31d01c75c5 And another potential issue
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-22 08:23:53 +02:00
Willem Dantuma 0da8d3d46d Fix editing unidentified type
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-22 08:22:35 +02:00
Willem Dantuma 60761e9f4a Fix typo
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-21 19:28:14 +02:00
Willem Dantuma ec9684b826 Set upload flag only when file is found
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-21 19:11:30 +02:00
Willem Dantuma 1073044f31 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-21 18:40:10 +02:00
Willem Dantuma 81126974f5 After cancel a single file close the upload dialog 2020-07-21 18:39:51 +02:00
Mark van der Wal 06f443a503 fix circular dependency error.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-21 17:06:58 +02:00
Mark van der Wal eb560aaf33 added weather method do receive historical + forecast weatherdata.
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-07-21 16:57:11 +02:00
Willem Dantuma 464b82bfb9 Fix colspan
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-21 11:21:34 +02:00
Willem Dantuma 1c75fb6f71 Fix upload dialog
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-20 15:07:25 +02:00
Willem Dantuma 5f5d8a9712 Do not add when cancelled
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-20 14:59:27 +02:00
Willem Dantuma dc329a0e29 Try to fix file count
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-20 14:50:00 +02:00
Willem Dantuma 15a09e4b05 Attempt to fix multiple queue events for file upload
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-20 14:13:30 +02:00
Mark van der Wal 94f973406e fixed parent name size.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-15 23:35:22 +02:00
Mark van der Wal 6404e45d66 fix bug.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-15 23:28:17 +02:00
Mark van der Wal c0f689331e Added parentitem title to geotiff, shape and temporal selected-item components.
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-07-15 23:15:31 +02:00
Mark van der Wal 0f5a5251db only show legend title if one layer
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-15 13:41:25 +02:00
Mark van der Wal 3352bfd805 Added schema layout api to schemaService
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-09 13:45:24 +02:00
Willem Dantuma 60ed2afaa4 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-07-07 09:45:13 +02:00
Willem Dantuma 9ac534c171 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-07-07 09:42:30 +02:00
Willem Dantuma cecbdb2ded Fix dates
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-07-07 09:37:17 +02:00
Willem Dantuma 1092d5dcaf Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-07-07 09:31:47 +02:00
Willem Dantuma 4af6b2937c Refactor Date to string
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-07-07 09:24:45 +02:00
Mark van der Wal 263fb6c3d4 Changed schema service to return any for json object.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-30 16:30:33 +02:00
Willem Dantuma 09fa8b4f1f Fix template selection
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-30 09:11:46 +02:00
Willem Dantuma 214dc3ffa1 Refactor temporallast
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-29 16:09:19 +02:00
Willem Dantuma fad04744cf Refactor ILayer
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-29 16:00:53 +02:00
Willem Dantuma 033b74517f Export IDataLayer
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-29 15:51:08 +02:00
Willem Dantuma 0b7564e874 Add data layer
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-29 15:44:23 +02:00
Willem Dantuma 0d247e6416 Fix layerswitcher not opening
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-26 09:18:07 +02:00
Willem Dantuma b92cc7bc09 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-26 09:02:33 +02:00
Willem Dantuma eba18b0235 Close menu's on map click
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-06-26 08:49:35 +02:00
Willem Dantuma 69f8184dfe add closeall action
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-26 08:22:31 +02:00
Willem Dantuma 31c1570ffb Fix relogin issue on mobile
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-25 19:04:40 +02:00
Willem Dantuma fe2650c4fd Refactored logout
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-25 18:52:13 +02:00
Willem Dantuma f89209c555 Add logout event handler
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-25 17:21:12 +02:00
Willem Dantuma b3d0a6f0c7 parse dataenddate
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-25 10:34:25 +02:00
Willem Dantuma 6bd1726fc9 Add dataenddate
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-25 10:01:54 +02:00
Willem Dantuma b0ff54d157 Add dataenddate
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-25 09:47:53 +02:00
Willem Dantuma 277dc7051e Add shadow and transition
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-24 15:49:57 +02:00
Willem Dantuma ace4a6b364 Implement toggleaccountmenu action
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-24 15:07:11 +02:00
Willem Dantuma 146514d386 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-24 13:08:27 +02:00
Willem Dantuma 1187ee9fd6 Implement logout 2020-06-24 13:08:13 +02:00
Mark van der Wal 4527276254 Changed schema service.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-24 11:52:05 +02:00
Willem Dantuma 6f52302875 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-24 08:40:28 +02:00
Willem Dantuma cbe27c2add Refactor template selection logic add forpackage decorator
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-06-24 08:35:34 +02:00
Willem Dantuma cd156ab1bc Export packageservice
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-24 07:56:28 +02:00
Willem Dantuma f9d0e2aee0 Implemented hasclaim directive
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-23 17:51:47 +02:00
Willem Dantuma 253b3d3c90 Fix build
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-23 15:44:14 +02:00
Willem Dantuma 28d4adc571 AW-1330
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details
2020-06-23 15:39:30 +02:00
Willem Dantuma 925af1e645 Update dependency
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-23 14:18:49 +02:00
Willem Dantuma 4130e0a796 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-23 13:36:29 +02:00
Willem Dantuma 01933b1602 AW-1330 add atitemlocationitem parameter 2020-06-23 13:36:03 +02:00
Mark van der Wal 0482aa7124 Added provided in root for schema service
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-22 13:37:38 +02:00
Mark van der Wal 75015f6d22 Added schema service
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-22 13:12:02 +02:00
Mark van der Wal aa3707aa56 Added getSchema method to itemtypes service.
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-22 12:20:02 +02:00
Willem Dantuma ff06b419f2 Fix top in fullscreen mode
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-12 12:53:43 +02:00
Willem Dantuma c1c0bd2596 Add start of user/account menu
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-12 12:24:08 +02:00
Willem Dantuma 978cbdabfc Read both farmmaps currentuser and authenticate userinfo
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-06-10 21:53:54 +02:00
Willem Dantuma e0d585e125 Fix wrapping
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-29 10:00:53 +02:00
Willem Dantuma cc6229002c Make histogram info block collapsable
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-27 10:57:25 +02:00
Willem Dantuma ca776b0cb5 Fix layer index for real this time ( https://angular.io/guide/ivy-compatibility-examples#cannot-bind-to-value-property-of-select-with-ngfor )
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-27 09:14:43 +02:00
Willem Dantuma 7b29ca28d9 Fix layer index
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-26 18:19:46 +02:00
Willem Dantuma 0fb71a9227 Fix i18n tag
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-26 17:20:30 +02:00
Willem Dantuma f1bfc9fec0 Add confidence interval
FarmMaps.Develop/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details
2020-05-26 17:19:07 +02:00
Willem Dantuma 705d811832 Fix layer index
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-26 17:04:44 +02:00
Willem Dantuma 3ed68efab7 Mark some text as translatable
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-25 10:04:35 +02:00
Willem Dantuma 454dc26128 Try to fix exception
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-21 18:28:03 +02:00
Willem Dantuma d56cfa805b Fix some issues
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-21 18:18:38 +02:00
Willem Dantuma 506b15cd4f Fix null ref
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-19 11:51:06 +02:00
Willem Dantuma 4a0474546c Converted observer to behaviorsubject 2020-05-19 11:46:27 +02:00
Willem Dantuma 51bb5b3833 Fix base map not showing
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-19 11:14:07 +02:00
Willem Dantuma f4d1a04303 Add profile scope, expose start and stop methods events service
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-16 10:46:55 +02:00
Willem Dantuma 44cac3e1ab Update libs
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-13 12:47:26 +02:00
Willem Dantuma 2ea51d94ef Add basic package managing plumbing
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-13 12:30:09 +02:00
Willem Dantuma 750a743a50 Fix promise resolve
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-11 20:57:45 +02:00
Willem Dantuma 1c8db3ac94 Add some debug logging
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-11 20:50:38 +02:00
Willem Dantuma b70ec77328 Fix authguard
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-11 20:39:00 +02:00
Willem Dantuma baf8767a91 Refactor authentication flow
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-09 09:14:16 +02:00
Willem Dantuma 62887e8089 Implement canactivatechild also
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-06 14:13:10 +02:00
Willem Dantuma 24eef611d4 Add get user selector
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-05-04 14:47:04 +02:00
Willem Dantuma 62d5779c75 Fix url at page refresh
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-23 11:11:07 +02:00
Willem Dantuma 3493e96aad Fix panel on mobile
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-23 10:50:29 +02:00
Willem Dantuma 23ff92de6c Update libs
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-23 09:08:44 +02:00
Willem Dantuma 279d7eeca6 Fix imports
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-22 12:34:07 +02:00
Willem Dantuma bb979e4322 Merge branch 'feature/streamline_flow' into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-22 12:27:11 +02:00
Willem Dantuma d57ffe59e7 Fix style 2020-04-22 12:16:03 +02:00
Willem Dantuma 4dfa2cd96c Fix query 2020-04-22 09:25:10 +02:00
Willem Dantuma 7eef50eb7a Remove uneeded delay 2020-04-22 08:59:04 +02:00
Willem Dantuma 69751540d3 More refactoring, add thematic maps button 2020-04-22 08:11:50 +02:00
Willem Dantuma ef81b04f4e More refactoring 2020-04-21 14:54:13 +02:00
Willem Dantuma e41c728fb2 Fix zoom to extent 2020-04-21 13:22:54 +02:00
Willem Dantuma 4e83bc6158 Some refactoring 2020-04-21 12:31:20 +02:00
Willem Dantuma c6d7f6b0cb Add action logging and some refactoring 2020-04-17 13:26:50 +02:00
Willem Dantuma 3828db341a Add debug logging
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-17 08:39:48 +02:00
Willem Dantuma da0534e928 Make templating more responsive
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-17 08:01:39 +02:00
Willem Dantuma be4cbd36d1 Add null check
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-16 17:43:13 +02:00
Willem Dantuma 8e0c424f81 Try to fix navigation issue
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-16 17:32:02 +02:00
Willem Dantuma e30d95ff09 Refactor edit_in_editor
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-16 17:05:07 +02:00
Willem Dantuma 0b32153489 Also supply parentcode and itemtype
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-16 16:01:06 +02:00
Willem Dantuma 3e0cf6d691 Fix click on feature
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-16 15:47:15 +02:00
Willem Dantuma d34a2069d6 Fix feature highlighting
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-16 13:19:06 +02:00
Willem Dantuma 9fbc946c68 Repeat signalR authenticate
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-16 11:04:39 +02:00
Willem Dantuma e964fa72f3 Automatic reconnect signalR
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-15 21:31:02 +02:00
Willem Dantuma 1532e141b9 Add getScaledValueto both
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-07 10:22:27 +02:00
Willem Dantuma 490cd92707 Fix class
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-07 09:53:32 +02:00
Willem Dantuma d6c89c7ada Add getScaledValue function
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-07 09:43:54 +02:00
Willem Dantuma dd138f1168 Use scale in legend
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-07 08:51:31 +02:00
Willem Dantuma 1b165c3575 Remove uneeded search minify
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-07 07:58:04 +02:00
Willem Dantuma 77478078f6 Fix i18n tags
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2020-04-06 14:51:43 +02:00
Willem Dantuma 61e6092cb3 Update libs
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-04-03 14:03:30 +02:00
Willem Dantuma 0d78fa29f3 Merge branch 'feature/Upgrade_to_angular_9' into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-04-03 13:52:39 +02:00
Willem Dantuma a892cb890b Move dependencies to peerdependencies 2020-04-02 09:07:19 +02:00
Willem Dantuma 8a6b376373 Revert ol to 6.1.1 2020-04-02 08:43:43 +02:00
Willem Dantuma 80ddf816b0 More migration fixes 2020-04-01 16:11:44 +02:00
Willem Dantuma 511f1f4731 Add @Directive attributes 2020-04-01 10:05:44 +02:00
Willem Dantuma a5a7e1ece1 Updated ol to6.2.1 2020-04-01 09:19:19 +02:00
Willem Dantuma c9d1fba36d Updated peer dependencies common 2020-04-01 09:13:41 +02:00
Willem Dantuma ad7cc655d1 Updated other deps 2020-04-01 09:09:42 +02:00
Willem Dantuma 34990e5de2 Update to angular 9 2020-04-01 09:06:11 +02:00
Willem Dantuma 984408cd52 Update tsickle 2020-04-01 09:02:15 +02:00
Willem Dantuma 3b1b9c0b98 Update @ng-bootstrap 2020-04-01 09:00:30 +02:00
Willem Dantuma 7f776cf56b Update to latest 8.x 2020-04-01 08:55:55 +02:00
Peter Bastiani 8ef248b0a7 AW-1037 Add filter parameter
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-27 15:53:26 +01:00
Willem Dantuma bf883a779f AW-1079
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-27 13:22:11 +01:00
Willem Dantuma 050fda377b Fix unnecessary "hops" after zooming
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-26 15:55:21 +01:00
Willem Dantuma dad8e061ea AW-1079
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-26 15:45:57 +01:00
Willem Dantuma bc17f80050 Fix AW-1056, AW-1080
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-26 14:29:18 +01:00
Peter Bastiani 8db1edb262 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-26 14:06:32 +01:00
Peter Bastiani e279c04e62 AW-1037 Add itemtasklist to service. 2020-03-26 14:05:50 +01:00
Willem Dantuma 0da2167591 Update dependencies
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-26 14:01:28 +01:00
Peter Bastiani 8e0d302fd4 Revert "AW-1079 Only add one item to overlay."
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
This reverts commit 9c16681b58.
2020-03-26 13:28:36 +01:00
Peter Bastiani 9c16681b58 AW-1079 Only add one item to overlay.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-26 10:38:39 +01:00
Peter Bastiani d883553934 AW-1104 Pfffft
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-25 14:59:17 +01:00
Peter Bastiani 340d07a03f AW-1104 Fixed link to temporal viewer (graph broken).
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2020-03-25 14:56:17 +01:00
Willem Dantuma 4bbc22cbde Merge branch 'feature/fix_zoom_issue_after_edit_take2' into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-22 20:25:36 +01:00
Willem Dantuma 80134e5ad0 Remove logging 2020-03-22 20:22:52 +01:00
Willem Dantuma c777ce75ad Fix zoom issue 2020-03-22 20:08:53 +01:00
Peter Bastiani af12682341 AW-1084 Fix "An unhandled exception occurred: projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts(5,70): error TS2300: Duplicate identifier 'IItem'.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts(11,10): error TS2300: Duplicate identifier 'IItem'".
2020-03-20 11:19:30 +01:00
Peter Bastiani 28cfc045fb AW-1084 Van der Sat: cropyear to viewer.
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2020-03-20 11:15:47 +01:00
Peter Bastiani 9b98f3d91c AW-1072 VanderSat: Balkjes wat dichter bij getallen: % staat soms op volgende regel
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-20 10:47:57 +01:00
Peter Bastiani 0814a6a877 AW-981 Also export type.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-04 10:28:42 +01:00
Peter Bastiani 23eb27cf7f AW-981 Add Alert enum.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-04 10:19:10 +01:00
Willem Dantuma 33b15677d2 Enable chart button
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-04 09:35:54 +01:00
Willem Dantuma 902c3c629e Fix thematic map click
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-03 22:18:01 +01:00
Willem Dantuma 4169d1a26e Fix build
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-03 21:16:01 +01:00
Willem Dantuma 7d3679afd2 Add goto chart
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2020-03-03 21:06:39 +01:00
Willem Dantuma 6921bc7f4a Styling changes
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-03 21:02:33 +01:00
Willem Dantuma 0621b32fba Fix legend
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-03 19:43:17 +01:00
Willem Dantuma 2388968f2a Fix layer selection
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-03 19:24:01 +01:00
Willem Dantuma 24f41879bf Fix query
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-03 16:32:25 +01:00
Willem Dantuma d4ee784460 Fix import
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-03 10:54:57 +01:00
Willem Dantuma 2434fbf5ee Update libs
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-03 10:32:15 +01:00
Willem Dantuma 141b5055d7 Merge branch 'feature/Temporal_item' into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-03-03 10:22:27 +01:00
Willem Dantuma a8f82f800f Fixed some issue 2020-03-03 10:21:24 +01:00
Willem Dantuma 5343a4aa98 Basic working version 2020-03-02 13:48:10 +01:00
Willem Dantuma 60c741d935 Implement next and preious temporal 2020-03-02 09:22:16 +01:00
Willem Dantuma be885ce917 Merge branch 'develop' into feature/Temporal_item 2020-03-02 08:57:20 +01:00
Willem Dantuma da1c9c3fe2 More refactoring 2020-03-02 08:55:11 +01:00
Willem Dantuma a151b73d03 Some refactoring 2020-02-29 11:56:19 +01:00
Willem Dantuma 47f77c2819 Display last 2020-02-27 21:41:52 +01:00
Willem Dantuma 841999daba Make itemtype optional
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-27 18:01:17 +01:00
Willem Dantuma 8e29e479de Add selecttemporalitemssuccess 2020-02-27 17:59:00 +01:00
Willem Dantuma 3094170cc2 Some refactoring 2020-02-27 16:28:10 +01:00
Willem Dantuma 795e8fdf0e Fix double scaling issue
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-26 19:29:34 +01:00
Willem Dantuma 007448878b Revert "Revert "Fix thumbnail scaling on zoomed browser""
This reverts commit ebf362e9a9.
2020-02-26 17:21:02 +01:00
Willem Dantuma ebf362e9a9 Revert "Fix thumbnail scaling on zoomed browser"
This reverts commit 1c70e3495f.
2020-02-26 17:03:00 +01:00
Willem Dantuma 1c70e3495f Fix thumbnail scaling on zoomed browser
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-26 08:44:32 +01:00
Willem Dantuma e75d71d748 Implement client side thumbnail renderer for features
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-25 20:19:28 +01:00
Willem Dantuma 6916e4650a Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-25 15:14:46 +01:00
Willem Dantuma 38c8def43a Add area to selected-item-cropfield 2020-02-25 15:14:29 +01:00
Peter Bastiani 9c103a0c40 AW-942 Add (optional) deep parameter to getChildItemList.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-25 15:04:12 +01:00
Willem Dantuma d3b10d46ad Add area and croptype to feature-list-feature-cropfield
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-25 14:37:06 +01:00
Willem Dantuma f8c3a0db98 Select better threshold for mobile detection
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-25 11:52:27 +01:00
Willem Dantuma 0eaa3065a3 Add margin 2020-02-25 11:26:57 +01:00
Willem Dantuma f91d727c99 Convert to svg and style rotation-reset
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-25 10:37:03 +01:00
Willem Dantuma fd18d4921b Fix border color search input
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-24 23:53:32 +01:00
Willem Dantuma 16ad7bfb6f Style map controls as buttons
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-24 23:26:28 +01:00
Willem Dantuma a3e14a94cc Remove old theming, use correct theme colors and a friendlier icon
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-22 09:45:41 +01:00
Willem Dantuma 2b5bda2a44 Try to fix loop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-21 11:51:42 +01:00
Willem Dantuma 85143986ee remove show_as_featurelist again
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-21 11:28:46 +01:00
Willem Dantuma ba0a60ba09 Fixes for explorer
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-21 11:16:30 +01:00
Willem Dantuma a1d7f6d4d2 Fix for diffrent action on feature select on map
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-21 11:06:16 +01:00
Willem Dantuma c341b3e42f Another attemt to fix zooming
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-21 00:51:10 +01:00
Willem Dantuma 3a38c24360 Fix several issues, attemt to fix zooming issue
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-21 00:11:18 +01:00
Willem Dantuma abfef73cd1 Refactoring map, place state where it belongs
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-20 21:20:50 +01:00
Willem Dantuma f82125a486 Fix navigation issue
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-20 17:38:05 +01:00
Willem Dantuma 1a3bbf26f2 Set layerindex
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-19 16:08:46 +01:00
Willem Dantuma 616644de6c Merge branch 'features/geotiff_band_rendering' into develop 2020-02-19 14:56:22 +01:00
Willem Dantuma c16b9ef5c9 Fix download link on local 2020-02-19 14:55:29 +01:00
Willem Dantuma 7a27df60c2 Implement select_as_mapitem
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-19 12:02:56 +01:00
Willem Dantuma e8493ef0bd Fix build
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-19 11:48:57 +01:00
Willem Dantuma dae5411e6a Update peer dependency
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2020-02-19 11:44:07 +01:00
Willem Dantuma 755475bff7 Remove stateserializerservice from common-map
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2020-02-19 11:37:21 +01:00
Willem Dantuma 9c5955bc6f Forgot to export stateserializerservice
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-19 11:23:43 +01:00
Willem Dantuma 17af34ff94 Move query state to common
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-19 11:15:31 +01:00
Mark van der Wal 92c8b4c1b6 changed selected item geotiff to show layer changer 2020-02-19 10:57:11 +01:00
Mark van der Wal aa6cd254c7 changed image api 2020-02-19 10:53:14 +01:00
Willem Dantuma 3baf0b15c7 Show edit action only when item editable
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-19 09:34:35 +01:00
Willem Dantuma 593fa78f13 Make isEditable optional
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-19 09:03:02 +01:00
Willem Dantuma a39578e1a4 Add iseditable to interface
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-18 22:09:58 +01:00
Willem Dantuma f5868618b7 Add isEditable
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-18 22:02:34 +01:00
Willem Dantuma 2920fd82f1 Fix viewer
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-18 17:00:19 +01:00
Willem Dantuma ad11de53af Fix z-index layer switcher
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-18 16:41:24 +01:00
Willem Dantuma d7ac9b937a Update libs
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-18 08:20:32 +01:00
Willem Dantuma 3a4b5dbd9b Fix collopsed search box size on mobile
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-18 08:16:51 +01:00
Willem Dantuma 6eb1b5af55 Update app to match library changes
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-18 08:03:42 +01:00
Willem Dantuma aa09953b67 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-17 18:31:40 +01:00
Willem Dantuma a8b079b72b Add layerswitcher 2020-02-17 18:31:23 +01:00
Peter Bastiani fcef78dee0 AW-915 Use proper container (not just the first).
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-17 12:49:08 +01:00
Willem Dantuma fd28af2f6c Fix lost styling after navigation
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-17 10:23:17 +01:00
Willem Dantuma 81ed89b240 Fix select on hover ( null ref)
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-14 10:21:49 +01:00
Willem Dantuma 52b4f90b78 Fix selected style
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-13 16:51:23 +01:00
Willem Dantuma 79f45631a0 Fix Set style Geometry
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-13 16:14:18 +01:00
Willem Dantuma 6060a8b86a Use a Style or a Style function as parameter to setStyle action 2020-02-13 16:01:05 +01:00
Willem Dantuma 4814b8fbad Change configuration for identityserver
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-13 14:45:10 +01:00
Willem Dantuma da97f06db8 npm update
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-13 11:29:55 +01:00
Willem Dantuma 709e964579 Add custom style for vnd.farmmaps.itemntype.layer
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-13 11:24:23 +01:00
Willem Dantuma 3c0bece982 Fix select feature on hover in list
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-13 09:56:17 +01:00
Willem Dantuma 1646119b16 Merge branch 'feature/AW-847' into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-12 21:34:43 +01:00
Willem Dantuma 252ce855c9 Add id4AuthconfigFactory 2020-02-12 21:34:11 +01:00
Willem Dantuma 937dbe9b43 Use refactored styles 2020-02-12 21:33:28 +01:00
Willem Dantuma 6379b64351 Refactor style cache 2020-02-12 20:38:14 +01:00
Willem Dantuma b83aca7969 Refactor itemtype loading
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-11 18:55:43 +01:00
Willem Dantuma 52170590e3 Remove fm-map-item-features-source ( obsolete )
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-11 14:48:40 +01:00
Willem Dantuma 7a1ba95212 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-05 14:57:35 +01:00
Willem Dantuma 4eb10aa676 AW-900 2020-02-05 14:57:12 +01:00
Mark van der Wal 1cab239155 AW-811: Changed weatherservice
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-04 17:38:04 +01:00
Willem Dantuma 1bec8c2038 Fix menu
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-04 14:21:40 +01:00
Willem Dantuma 9433ef87b2 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop 2020-02-04 14:20:48 +01:00
Willem Dantuma f0b2b1e774 Add register device placeholder 2020-02-04 14:20:32 +01:00
Mark van der Wal 123bf2943a AW-811: Added weather service to common
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-04 13:57:33 +01:00
Peter Bastiani fd3545523e Remove annoying 'debugger' statement.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-03 10:32:15 +01:00
Peter Bastiani 6c828f6c6d AW-803 Add count childitems for widget.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-02-03 09:28:24 +01:00
Willem Dantuma 62234b3f9d Refactor authentication flow
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-31 11:24:45 +01:00
Peter Bastiani e53378a76b AW-803 Fixed -> ERROR: projects/common/src/fm/services/item.service.ts(114,78): error TS2559: Type 'string' has no properties in common with type '{ headers?: HttpHeaders | { [header: string]: string | string[]; }; observe?: "body"; params?: HttpParams | { [param: string]: string | string[]; }; reportProgress?: boolean; responseType?: "json"; withCredentials?: boolean; }'.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-30 14:13:59 +01:00
Peter Bastiani e41b94bb77 AW-803 Add deleteItem.
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2020-01-30 13:58:01 +01:00
Willem Dantuma 975efe5958 Make upload progress panel optional
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-29 10:23:07 +01:00
Peter Bastiani 5e8e2388b5 AW-803 Ooops
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-28 11:39:09 +01:00
Peter Bastiani eea6bbbcb5 AW-803 Refactor add
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-28 11:37:33 +01:00
Peter Bastiani 05705afdfe AW-803 Fix casing issue. Remove unused parms.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-28 09:50:33 +01:00
Peter Bastiani 0ba553cc40 AW-803 Add postItem.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-28 09:03:29 +01:00
Willem Dantuma 0674b0ac7c Close menu on navigation
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-27 17:28:17 +01:00
Willem Dantuma 252e920848 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-27 17:01:39 +01:00
Willem Dantuma 77e4093d14 Close menu on navigation 2020-01-27 17:01:35 +01:00
Mark van der Wal 19a8393a3a AW-814: Changed widget component height
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-27 15:03:01 +01:00
Willem Dantuma af1a54ae07 Fix container width and spacing
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-23 12:20:35 +01:00
Peter Bastiani 63ffdf2519 AW-803 Pass array (take 2).
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-22 14:18:09 +01:00
Peter Bastiani e3714f4cac AW-803 Added CodeListItemService.
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2020-01-22 14:12:57 +01:00
Peter Bastiani e8537ba916 AW-803 Pass string array.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-22 13:57:56 +01:00
Willem Dantuma 2fca6d1fba Update more deps
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-22 11:44:52 +01:00
Willem Dantuma 2199a929eb Update deps 2020-01-22 11:42:20 +01:00
Willem Dantuma 6389331c30 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
# Conflicts:
#	projects/common/src/fm/common-service.module.ts
2020-01-22 11:34:32 +01:00
Willem Dantuma 3f27662e3f Make authstorage configurable 2020-01-22 11:33:33 +01:00
Peter Bastiani 313e0c94f7 AW-835 Fixed ERROR: projects/common/src/fm/services/codelistitem.service.ts(23,5): error TS2322: Type 'Observable<ICodeListItem>' is not assignable to type 'Observable<ICodeListItem[]>'.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-22 10:05:03 +01:00
Peter Bastiani a12b45f8f9 AW-835 Added CodeListItem. Some cleanup.
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2020-01-22 09:52:40 +01:00
Peter Bastiani 587e484cf8 AW-835 Remove validFrom/To filter from interface.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-21 18:15:50 +01:00
Peter Bastiani e8845a092a AW-803 Add CodeListItem + service.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-21 14:52:36 +01:00
Willem Dantuma 3dca804acd Re login after refresh error
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-20 18:05:45 +01:00
Willem Dantuma 761e987067 navigate after refresh
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-20 18:03:04 +01:00
Willem Dantuma 9277b1fa25 Remove authguard
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-20 17:31:09 +01:00
Willem Dantuma 9103753b09 Try to refresh on startup
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-20 17:26:35 +01:00
Willem Dantuma f99dfc965f Fix z-index menu overlay
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-17 17:38:53 +01:00
Willem Dantuma 91fb3ac329 Fix menu sliding
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-17 16:39:08 +01:00
Willem Dantuma 36cc8bea7e AW-821 use local storage for tokens
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-15 13:48:49 +01:00
Willem Dantuma e875ed5a12 Update deps
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-14 16:52:24 +01:00
Willem Dantuma 1a0e0b13e7 Make granttype configurable
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-14 16:46:59 +01:00
Willem Dantuma f71d96be6e Fix width
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-13 14:43:02 +01:00
Willem Dantuma 40429a67ef Fix menu height
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-08 17:46:52 +01:00
Willem Dantuma 71e7467c17 Realy fix build
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-08 14:52:35 +01:00
Willem Dantuma d860d9edd2 Fix build
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2020-01-08 14:46:49 +01:00
Willem Dantuma 8decff316b Fix menu outlet
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2020-01-08 14:43:44 +01:00
Willem Dantuma f21648386b AW-823 implementcorrect editor navigation 2020-01-08 14:43:24 +01:00
Willem Dantuma ab99f6722c Implement menu button
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-08 14:23:24 +01:00
Willem Dantuma 46d0f8c060 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-08 11:38:13 +01:00
Willem Dantuma b46c33d15c Show navbar 2020-01-08 11:37:57 +01:00
Willem Dantuma d3bc921000 Add menu background 2020-01-08 11:37:37 +01:00
Peter Bastiani 2c3c8fbff2 Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-08 10:28:15 +01:00
Peter Bastiani 0bf0941bdc Ignore Visual Studio generated files 2020-01-08 10:28:05 +01:00
Willem Dantuma c52497af59 Fix build
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-07 22:31:56 +01:00
Willem Dantuma 6ad23d280d Fix build
FarmMaps.Develop/FarmMapsLib/develop Something is wrong with the build of this commit Details
2020-01-07 22:31:27 +01:00
Willem Dantuma bf0dc15a00 Refactor map for menu removal
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2020-01-07 22:27:46 +01:00
Willem Dantuma 73550b3201 Some menu fixes
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-07 21:43:48 +01:00
Willem Dantuma e077aa34df Refactor menu panel
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-07 16:33:56 +01:00
Willem Dantuma 58f7c99ddc Store mapstate in localstorage
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-06 18:36:47 +01:00
Willem Dantuma 50d1d9645a Implement copassheading
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-03 16:40:14 +01:00
Willem Dantuma 41d55110ea Fix zone
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-03 15:00:11 +01:00
Willem Dantuma 867fdc3fcc Update libs
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-02 18:22:59 +01:00
Willem Dantuma 64c02614ba Implement pan to, fix zooming on map change
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2020-01-02 18:11:02 +01:00
Willem Dantuma ac5efdb40f Mark for check on navigation
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-12-27 13:26:39 +01:00
Willem Dantuma 4b232cc0e4 Use location for path
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-12-23 17:33:43 +01:00
Peter Bastiani 70fb5b42ec AW-784 Fixed 1 │ @import "../../../app/theme.scss";
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss 1:9  root stylesheet
An unhandled exception occurred: Can't find stylesheet to import.
2019-12-20 10:05:49 +01:00
Peter Bastiani 719c699981 Merge branch 'feature/AW784_MergeFarmMapsMap_FarmMapsLibMap' into develop
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-12-20 09:59:04 +01:00
Peter Bastiani 456628d014 AW-784 Reapply from Farmmaps commits
- cd035366: AW-718 Layout as requested by Thomas.
2019-12-20 09:53:22 +01:00
Peter Bastiani 76a44a8f95 AW-784 Reapply from Farmmaps commits
- cd035366: AW-718 Layout as requested by Thomas.
2019-12-20 09:50:21 +01:00
Peter Bastiani f66428d04c AW-784 Reapply from Farmmaps commits
- cd035366: AW-718 Layout as requested by Thomas.
2019-12-20 09:47:33 +01:00
Peter Bastiani ee925d07b4 AW-784 Reapply from Farmmaps commits
- 47deb5f6: AW-772 Panels
2019-12-20 09:41:06 +01:00
Peter Bastiani 9b03b49028 AW-784 Reapply from Farmmaps commits
- 47deb5f6: AW-772 Panels
2019-12-20 09:39:29 +01:00
Peter Bastiani 15c224ff5d AW-784 Reapply from Farmmaps commits
- 5d11bfe8: Enable histogram for shape
2019-12-20 09:36:55 +01:00
Peter Bastiani 7cb129dbc4 AW-784 Reapply from Farmmaps commits
- cd035366: AW-718 Layout as requested by Thomas.
2019-12-20 09:25:09 +01:00
Peter Bastiani 2059b48abb AW-784 Reapply from Farmmaps commits
- a4bb051a: AW-738 fixed bug
2019-12-20 09:19:53 +01:00
Peter Bastiani e1ff44ed3c AW-784 Reapply from Farmmaps commits
- 6f79b625: AW-738 changed selected-item-container to allow forSourceTask annotation.
2019-12-20 09:18:00 +01:00
Willem Dantuma 709c76a851 Hack for cordova
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-12-19 18:29:44 +01:00
Willem Dantuma 677608c14d Fix configuration loading
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-12-19 17:03:10 +01:00
Willem Dantuma fd8025c674 Update sample app
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-12-19 13:41:59 +01:00
Willem Dantuma 560c426bc0 Refactor authconfig
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-12-19 13:32:51 +01:00
Willem Dantuma e1fef2d7f3 Show histogram
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-12-18 10:21:25 +01:00
Willem Dantuma f44b079cde Fix thumbnail source
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-12-11 18:03:37 +01:00
Willem Dantuma 8e5383b0f2 Update deps
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-12-11 10:47:32 +01:00
Willem Dantuma 615872992f Implement device update event
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-12-11 10:29:47 +01:00
Willem Dantuma 2e0b090fb7 Added deviceUpdateEvent
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-12-10 18:14:48 +01:00
Willem Dantuma 5d7fd63adc Oops remember to test it next time..
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-29 12:52:18 +01:00
Willem Dantuma 0948bacaaf Merge latest changes
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-11-29 12:24:34 +01:00
Peter Bastiani 8fd653afbc AW-698 Round percentage "Uploading files".
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-29 09:18:35 +01:00
Peter Bastiani b058cb80b1 AW-716 Spacing
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-29 09:17:45 +01:00
Willem Dantuma 490ae1868b Update README
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-25 16:22:55 +01:00
Willem Dantuma 4384fd1387 Update example to angular 8.2 and ol 6
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-25 15:52:02 +01:00
Willem Dantuma 529b1c9bd7 Upgrade @farmmaps/common-map to angular 8.2
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-25 15:31:42 +01:00
Willem Dantuma fc84548d8a Oops forgot ng build
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-25 14:49:46 +01:00
Willem Dantuma e57b8297c0 Disable common-map temporarily
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-11-25 14:47:20 +01:00
Willem Dantuma efe38aba62 Update @farmmaps/common to angular 8.2
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-11-25 14:43:26 +01:00
Willem Dantuma 7bd5dada2b Update to angular 8.2 2019-11-25 14:34:51 +01:00
Willem Dantuma 16db063339 Make bbox optional
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-18 09:42:05 +01:00
Willem Dantuma 5d79dcc7b6 Update library versions
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-13 11:46:23 +01:00
Willem Dantuma deda769e8b Add service module
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-12 22:50:57 +01:00
Willem Dantuma f31e4154b2 Fix date parsing for lists
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-12 16:27:08 +01:00
Willem Dantuma 7476e4c928 Set configuration correctly
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-11 17:38:49 +01:00
Willem Dantuma d5258b7c79 Update versions
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-11 15:42:50 +01:00
Willem Dantuma 04929a1ca3 Removed index.ts files
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-11 15:39:19 +01:00
Willem Dantuma 67e0e5ed5d Use label instead of value if it is available 2019-11-11 11:08:23 +01:00
Willem Dantuma b620cedb6d Add NotImplemented page
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-08 13:48:43 +01:00
Willem Dantuma 471a85a428 Add NotImplemented component
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-08 13:37:38 +01:00
Willem Dantuma bd4be813ae Fix typo 2019-11-08 13:27:32 +01:00
Willem Dantuma b89072d0c5 Cleanup unused code 2019-11-08 13:27:19 +01:00
Willem Dantuma 4a64a702e8 Update versions
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-08 12:59:18 +01:00
Willem Dantuma ec7951dd14 Fix 404 and provider error
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-08 12:56:04 +01:00
Willem Dantuma 017ebd59f8 Fix typos
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-08 11:19:28 +01:00
Willem Dantuma 806a51d93d Add docker pull step
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-08 10:41:22 +01:00
Willem Dantuma d0dbb0e939 Adjust configuration
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-08 10:36:24 +01:00
Willem Dantuma 914afbbbf9 Update README
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-07 18:21:32 +01:00
Willem Dantuma 447f56cd7f Add missing exports
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-07 17:43:53 +01:00
Willem Dantuma 326bfc9da1 Fix versions
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-07 17:25:27 +01:00
Willem Dantuma ef8f029e17 Fix itemtype issue
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-07 16:54:58 +01:00
Willem Dantuma ce8cde20b2 Update versions
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-11-07 14:34:18 +01:00
Willem Dantuma eee83c03d5 Fix some styling
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-06 13:38:37 +01:00
Willem Dantuma 6ba1d39d31 Set appropiate log levels
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-06 09:08:42 +01:00
Willem Dantuma 9ebce8e0bb Some refactoring
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-05 17:19:33 +01:00
Willem Dantuma 28fabab175
Merge pull request #1 from wdantuma/dependabot/npm_and_yarn/lodash-4.17.15
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
Bump lodash from 4.17.11 to 4.17.15
2019-11-05 09:34:06 +01:00
dependabot[bot] 8c029e08da
Bump lodash from 4.17.11 to 4.17.15
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.15)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-05 08:18:45 +00:00
Willem Dantuma 88df700414 Remove some files
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-05 08:59:36 +01:00
Willem Dantuma bb9fba996f First functional version
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-04 18:47:15 +01:00
Willem Dantuma cec43a636c Renamed prefixes in angular.json
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-04 13:43:46 +01:00
Willem Dantuma c32214f544 Use correct prefixes
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-04 13:34:15 +01:00
Willem Dantuma d57ebc2ad8 Prefixed map-common 2019-11-04 13:34:00 +01:00
Willem Dantuma 4de14abf89 Prefixed selectors
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-04 13:18:01 +01:00
Willem Dantuma d3782323f5 First functional version
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-11-01 16:53:24 +01:00
Willem Dantuma ca6331e053 Some fixes 2019-11-01 15:57:50 +01:00
Willem Dantuma 173be180ce Added itemdeleted event
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-10-30 22:34:12 +01:00
Willem Dantuma 960db9e27a Add missing export
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-10-30 18:13:32 +01:00
Willem Dantuma d804f70bed Re add removed exports
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-10-30 17:56:56 +01:00
Willem Dantuma f4ab353505 Add taskevents to actions
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-10-30 17:39:20 +01:00
Willem Dantuma cbda838c19 Fix build
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-10-28 16:26:48 +01:00
Willem Dantuma 8aafeccea6 Add common-map library
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-10-28 14:18:25 +01:00
Willem Dantuma 4170598401 Remove mapicon
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-09-18 10:55:49 +02:00
Willem Dantuma bb20ffff58 Fix resumableupload issue
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-09-16 16:58:57 +02:00
Willem Dantuma d7310dc378 Oops forgot to commit
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-09-12 10:00:54 +02:00
Willem Dantuma e728d7b042 Fix transparency and toggle on resize
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-09-12 09:57:45 +02:00
Willem Dantuma 7c0af90769 Increase clickable area resizegrip
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-09-12 09:22:46 +02:00
Willem Dantuma 2ec2f506a2 Implemented resizeable
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-09-11 18:40:10 +02:00
Willem Dantuma 97a16dcef5 Add sourcetask field
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-09-09 16:57:34 +02:00
Peter Bastiani b764700fef AW-526 And now the proper fix.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-08-19 13:15:20 +02:00
Peter Bastiani fbab3d75f3 AW-526 Undo commit c25c206 (FarmMaps) d.d. 18 June 2019 16:32:39, [HACK] Route Trijntje file to app instead of viewer.
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-08-19 12:54:02 +02:00
Willem Dantuma 391f0fc190 AW-432 fix item code
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-08-16 10:07:53 +02:00
Willem Dantuma 4671ce08d3 AW-432 converted event to action
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-08-16 09:40:00 +02:00
Willem Dantuma c5d7550750 AW-432 add click for uploaded file
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-08-16 09:26:25 +02:00
Willem Dantuma c3a2383b2e AW-432 added parentcode, datafilter and level tot getfeatures
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-08-09 21:32:42 +02:00
Willem Dantuma 4ec7a9a982 Make itemtypes public
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-08-08 14:12:51 +02:00
Willem Dantuma ec9bd4b974 AW-432 add itemtype service
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-08-08 13:59:07 +02:00
Willem Dantuma 7f6c403091 Fix panel height ( scroll issue )
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-08-07 09:42:28 +02:00
Willem Dantuma c59accbbc4 Make side panel responsive
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-08-07 09:11:05 +02:00
Willem Dantuma 538be1490a Add itemtype parameter
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-08-05 13:35:52 +02:00
Willem Dantuma 5665a64270 Update uploadx fixes upload zero size files
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-28 14:15:57 +02:00
Willem Dantuma 8c1b7ccf55 Add metadata to addfiles method
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-19 14:28:54 +02:00
Willem Dantuma 62570f3d81 Fix isuploading flag
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-19 10:23:30 +02:00
Willem Dantuma e502591176 Fix isuploading flag
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-19 10:07:01 +02:00
Willem Dantuma 455562aa90 Try to fix close issue
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-19 10:01:39 +02:00
Willem Dantuma e4b21306b1 Fix some issues
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-19 09:36:05 +02:00
Willem Dantuma 4770ffed0d Forgot old reference tot resumablejs
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-18 19:04:17 +02:00
Willem Dantuma ff30ad1cbe Replace resumablejs with ngx-uploadx
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-07-18 18:59:42 +02:00
Willem Dantuma 670cb6ceb5 Revert "Try to fix external js issue"
This reverts commit 8a5170a92c.
2019-07-17 16:55:17 +02:00
Willem Dantuma be97341cc0 Revert "Another try to fix external js issue"
This reverts commit eb06f41301.
2019-07-17 16:55:04 +02:00
Willem Dantuma eb06f41301 Another try to fix external js issue
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-17 15:25:17 +02:00
Willem Dantuma 8a5170a92c Try to fix external js issue
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-17 15:08:14 +02:00
Willem Dantuma b281f0bed8 Add resumable.js to fesm2015
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-17 13:16:19 +02:00
Willem Dantuma 3ba6c61a18 Export NgbDateNativeAdapter
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-17 12:02:02 +02:00
Willem Dantuma 6f28561303 Export more types, add stub for common-map library
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-17 11:51:14 +02:00
Willem Dantuma 4ab7e39b8e And another
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-16 17:25:26 +02:00
Willem Dantuma f96df36238 Another try
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-07-16 17:24:26 +02:00
Willem Dantuma 65924c1b85 First try to implement prerelease build number
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-07-16 17:20:59 +02:00
Willem Dantuma e2d6c14705 Add resumable js
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-07-16 17:04:28 +02:00
Willem Dantuma 1f0cb58f06 Remove refs to material
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-16 16:36:25 +02:00
Willem Dantuma 7562851e1d Add npm publish stage
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-07-16 16:32:58 +02:00
Willem Dantuma e03226ccc0 Fix typo
FarmMaps.Develop/FarmMapsLib/develop This commit looks good Details
2019-07-16 16:30:44 +02:00
Willem Dantuma 87718d1c3c Added jenkins.develop file
FarmMaps.Develop/FarmMapsLib/develop There was a failure building this commit Details
2019-07-16 16:29:37 +02:00
Willem Dantuma 0fe5cb166c First working version 2019-07-16 16:15:40 +02:00
Willem Dantuma f304cf5149 First try appcommon as library 2019-07-15 16:54:19 +02:00
Willem Dantuma fd17e0d538 Add local libs 2019-07-12 13:18:31 +02:00
Willem Dantuma 38a34b6388 Added stub for @farmmaps/common 2019-07-12 13:07:31 +02:00
397 changed files with 105696 additions and 6490 deletions

View File

@ -1,11 +1,11 @@
# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
#
# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
> 0.5%
last 2 versions
Firefox ESR
not dead
# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
#
# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11

3
.gitignore vendored
View File

@ -22,6 +22,7 @@ speed-measure-plugin.json
*.launch
.settings/
*.sublime-workspace
.vs/*
# IDE - VSCode
.vscode/*
@ -44,3 +45,5 @@ testem.log
# System Files
.DS_Store
Thumbs.db
projects/common/node_modules/
projects/common-map/node_modules/

54
Jenkinsfile vendored 100644
View File

@ -0,0 +1,54 @@
pipeline {
agent any
environment {
PACKAGE_VERSION_PREFIX=sh(script: 'jq .version package.json |sed "s/\\"//g"', returnStdout: true).trim()
PACKAGE_VERSION="${PACKAGE_VERSION_PREFIX + '.' + env.BUILD_NUMBER}"
}
stages {
stage('npm install'){
steps {
sh '''rm -rf node_modules/
npm install
cd projects/common
npm install
cd ../common-map
npm install
cd ../common-map3d
npm install
'''
}
}
stage('build'){
steps {
sh '''ng build common
ng build common-map
ng build common-map3d'''
}
}
stage('npm publish'){
steps {
sh '''cd dist/common
npm version ${PACKAGE_VERSION}
npm publish
cd ../common-map
npm version ${PACKAGE_VERSION}
npm publish
cd ../common-map3d
npm version ${PACKAGE_VERSION}
npm publish'''
}
}
}
post {
always {
emailext (
body: '${DEFAULT_CONTENT}',
mimeType: 'text/html',
replyTo: '${DEFAULT_REPLYTO}',
subject: '${DEFAULT_SUBJECT}',
to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
)
}
}
}

View File

@ -0,0 +1,54 @@
pipeline {
agent any
environment {
PACKAGE_VERSION_PREFIX=sh(script: 'jq .version package.json |sed "s/\\"//g"', returnStdout: true).trim()
PACKAGE_VERSION="${PACKAGE_VERSION_PREFIX + '-prerelease.' + env.BUILD_NUMBER}"
}
stages {
stage('npm install'){
steps {
sh '''rm -rf node_modules/
npm install
cd projects/common
npm install
cd ../common-map
npm install
cd ../common-map3d
npm install
'''
}
}
stage('build'){
steps {
sh '''ng build common
ng build common-map
ng build common-map3d'''
}
}
stage('npm publish'){
steps {
sh '''cd dist/common
npm version ${PACKAGE_VERSION}
npm publish
cd ../common-map
npm version ${PACKAGE_VERSION}
npm publish
cd ../common-map3d
npm version ${PACKAGE_VERSION}
npm publish'''
}
}
}
post {
always {
emailext (
body: '${DEFAULT_CONTENT}',
mimeType: 'text/html',
replyTo: '${DEFAULT_REPLYTO}',
subject: '${DEFAULT_SUBJECT}',
to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
)
}
}
}

View File

@ -1,33 +1,59 @@
# FarmmapsLibApp
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.8.
##Add a new library
Run `ng generate library lib-name --prefix=farmmaps` to add a new library in the `farmmaps` namespace. Build the library `ng build lib-name`.
##Add a new component
Run `ng generate component component-name --project=lib-name` to add a new component in a library. Export the new component from the librarys module. Add the new component to the entry file of the library (`public_api.ts`). Rebuild the library. Import the module in the consumer and use `<farmmaps-component-name></farmmaps-component-name>`.
## Development server
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
## Code scaffolding
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
## Build
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
## Running unit tests
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
## Running end-to-end tests
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
## Further help
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
# Farmmaps viewer
This is a sample FarmMaps client in Angular 7.x.
## Quick start
Use one of the two options below to get started.
## Option 1, Using docker
*Dependencies*
* docker desktop
*Setup*
```
docker pull node:12.13.1
docker run -t -i --entrypoint /bin/bash -p 4200:4200 node:12.13.1
```
Inside the running container
```
git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
cd FarmMapsLib
npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
npm install -g @angular/cli
npm install
ng serve --host 0.0.0.0
```
*Go*
Point your browser to http://localhost:4200
## Option 2, Using local machine
*Dependencies*
* npm 6.9.0
* nodejs 10.16.0
* git
*Setup*
```
git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
cd FarmMapsLib
npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
npm install -g @angular/cli
npm install
ng serve
```
*Go*
Point your browser to http://localhost:4200

View File

@ -11,22 +11,49 @@
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"customWebpackConfig": {
"path": "./custom-webpack.config.js"
},
"aot": true,
"outputPath": "dist/farmmaps-lib-app",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
{
"glob": "**/*",
"input": "src/assets/images",
"output": "/images"
},
{
"glob": "silent-refresh.html",
"input": "src/assets",
"output": "/"
},
{
"glob": "favicon.ico",
"input": "src/assets",
"output": "/"
},
{
"glob": "**/*",
"input": "node_modules/cesium/Build/Cesium",
"output": "/assets/cesium"
},
"src/configuration.json"
],
"styles": [
"src/styles.css"
"src/styles.css",
"node_modules/bootstrap/dist/css/bootstrap.min.css",
"fontawesome-5.15.2/css/all.min.css",
"fonts/FMIconFont/style.css",
"node_modules/cesium/Build/Cesium/Widgets/widgets.css",
"node_modules/ol/ol.css"
],
"scripts": [],
"es5BrowserSupport": true
"scripts": []
},
"configurations": {
"production": {
@ -49,14 +76,18 @@
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
"maximumError": "7mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "farmmaps-lib-app:build"
},
@ -131,33 +162,118 @@
}
}
},
"material": {
"root": "projects/material",
"sourceRoot": "projects/material/src",
"common": {
"root": "projects/common",
"sourceRoot": "projects/common/src",
"projectType": "library",
"prefix": "farmmaps",
"prefix": "fm",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "projects/material/tsconfig.lib.json",
"project": "projects/material/ng-package.json"
"tsConfig": "projects/common/tsconfig.lib.json",
"project": "projects/common/ng-package.json"
}
},
, "configurations": {
"production": {
"tsConfig": "projects/common/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/material/src/test.ts",
"tsConfig": "projects/material/tsconfig.spec.json",
"karmaConfig": "projects/material/karma.conf.js"
"main": "projects/common/src/test.ts",
"tsConfig": "projects/common/tsconfig.spec.json",
"karmaConfig": "projects/common/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/material/tsconfig.lib.json",
"projects/material/tsconfig.spec.json"
"projects/common/tsconfig.lib.json",
"projects/common/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"common-map": {
"root": "projects/common-map",
"sourceRoot": "projects/common-map/src",
"projectType": "library",
"prefix": "fm-map",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "projects/common-map/tsconfig.lib.json",
"project": "projects/common-map/ng-package.json"
}
, "configurations": {
"production": {
"tsConfig": "projects/common-map/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/common-map/src/test.ts",
"tsConfig": "projects/common-map/tsconfig.spec.json",
"karmaConfig": "projects/common-map/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/common-map/tsconfig.lib.json",
"projects/common-map/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"common-map3d": {
"projectType": "library",
"root": "projects/common-map3d",
"sourceRoot": "projects/common-map3d/src",
"prefix": "fm-map3d",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr:build",
"options": {
"tsConfig": "projects/common-map3d/tsconfig.lib.json",
"project": "projects/common-map3d/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/common-map3d/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/common-map3d/src/test.ts",
"tsConfig": "projects/common-map3d/tsconfig.spec.json",
"karmaConfig": "projects/common-map3d/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/common-map3d/tsconfig.lib.json",
"projects/common-map3d/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"

View File

@ -0,0 +1,10 @@
module.exports = {
node: {
// Resolve node module use of fs
fs: "empty",
Buffer: false,
http: "empty",
https: "empty",
zlib: "empty"
}
};

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,15 @@
/*!
* Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
*/
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: 400;
font-display: block;
src: url("../webfonts/fa-brands-400.eot");
src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
.fab {
font-family: 'Font Awesome 5 Brands';
font-weight: 400; }

View File

@ -0,0 +1,5 @@
/*!
* Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
*/
@font-face{font-family:"Font Awesome 5 Brands";font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-brands-400.eot);src:url(../webfonts/fa-brands-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.woff) format("woff"),url(../webfonts/fa-brands-400.ttf) format("truetype"),url(../webfonts/fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:"Font Awesome 5 Brands";font-weight:400}

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,15 @@
/*!
* Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
*/
@font-face {
font-family: 'Font Awesome 5 Pro';
font-style: normal;
font-weight: 300;
font-display: block;
src: url("../webfonts/fa-light-300.eot");
src: url("../webfonts/fa-light-300.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-light-300.woff2") format("woff2"), url("../webfonts/fa-light-300.woff") format("woff"), url("../webfonts/fa-light-300.ttf") format("truetype"), url("../webfonts/fa-light-300.svg#fontawesome") format("svg"); }
.fal {
font-family: 'Font Awesome 5 Pro';
font-weight: 300; }

View File

@ -0,0 +1,5 @@
/*!
* Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
*/
@font-face{font-family:"Font Awesome 5 Pro";font-style:normal;font-weight:300;font-display:block;src:url(../webfonts/fa-light-300.eot);src:url(../webfonts/fa-light-300.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-light-300.woff2) format("woff2"),url(../webfonts/fa-light-300.woff) format("woff"),url(../webfonts/fa-light-300.ttf) format("truetype"),url(../webfonts/fa-light-300.svg#fontawesome) format("svg")}.fal{font-family:"Font Awesome 5 Pro";font-weight:300}

View File

@ -0,0 +1,15 @@
/*!
* Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
*/
@font-face {
font-family: 'Font Awesome 5 Pro';
font-style: normal;
font-weight: 400;
font-display: block;
src: url("../webfonts/fa-regular-400.eot");
src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
.far {
font-family: 'Font Awesome 5 Pro';
font-weight: 400; }

View File

@ -0,0 +1,5 @@
/*!
* Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
*/
@font-face{font-family:"Font Awesome 5 Pro";font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-regular-400.eot);src:url(../webfonts/fa-regular-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.woff) format("woff"),url(../webfonts/fa-regular-400.ttf) format("truetype"),url(../webfonts/fa-regular-400.svg#fontawesome) format("svg")}.far{font-family:"Font Awesome 5 Pro";font-weight:400}

View File

@ -0,0 +1,16 @@
/*!
* Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
*/
@font-face {
font-family: 'Font Awesome 5 Pro';
font-style: normal;
font-weight: 900;
font-display: block;
src: url("../webfonts/fa-solid-900.eot");
src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
.fa,
.fas {
font-family: 'Font Awesome 5 Pro';
font-weight: 900; }

View File

@ -0,0 +1,5 @@
/*!
* Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
*/
@font-face{font-family:"Font Awesome 5 Pro";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.eot);src:url(../webfonts/fa-solid-900.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.woff) format("woff"),url(../webfonts/fa-solid-900.ttf) format("truetype"),url(../webfonts/fa-solid-900.svg#fontawesome) format("svg")}.fa,.fas{font-family:"Font Awesome 5 Pro";font-weight:900}

View File

@ -0,0 +1,371 @@
/*!
* Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
*/
svg:not(:root).svg-inline--fa {
overflow: visible; }
.svg-inline--fa {
display: inline-block;
font-size: inherit;
height: 1em;
overflow: visible;
vertical-align: -.125em; }
.svg-inline--fa.fa-lg {
vertical-align: -.225em; }
.svg-inline--fa.fa-w-1 {
width: 0.0625em; }
.svg-inline--fa.fa-w-2 {
width: 0.125em; }
.svg-inline--fa.fa-w-3 {
width: 0.1875em; }
.svg-inline--fa.fa-w-4 {
width: 0.25em; }
.svg-inline--fa.fa-w-5 {
width: 0.3125em; }
.svg-inline--fa.fa-w-6 {
width: 0.375em; }
.svg-inline--fa.fa-w-7 {
width: 0.4375em; }
.svg-inline--fa.fa-w-8 {
width: 0.5em; }
.svg-inline--fa.fa-w-9 {
width: 0.5625em; }
.svg-inline--fa.fa-w-10 {
width: 0.625em; }
.svg-inline--fa.fa-w-11 {
width: 0.6875em; }
.svg-inline--fa.fa-w-12 {
width: 0.75em; }
.svg-inline--fa.fa-w-13 {
width: 0.8125em; }
.svg-inline--fa.fa-w-14 {
width: 0.875em; }
.svg-inline--fa.fa-w-15 {
width: 0.9375em; }
.svg-inline--fa.fa-w-16 {
width: 1em; }
.svg-inline--fa.fa-w-17 {
width: 1.0625em; }
.svg-inline--fa.fa-w-18 {
width: 1.125em; }
.svg-inline--fa.fa-w-19 {
width: 1.1875em; }
.svg-inline--fa.fa-w-20 {
width: 1.25em; }
.svg-inline--fa.fa-pull-left {
margin-right: .3em;
width: auto; }
.svg-inline--fa.fa-pull-right {
margin-left: .3em;
width: auto; }
.svg-inline--fa.fa-border {
height: 1.5em; }
.svg-inline--fa.fa-li {
width: 2em; }
.svg-inline--fa.fa-fw {
width: 1.25em; }
.fa-layers svg.svg-inline--fa {
bottom: 0;
left: 0;
margin: auto;
position: absolute;
right: 0;
top: 0; }
.fa-layers {
display: inline-block;
height: 1em;
position: relative;
text-align: center;
vertical-align: -.125em;
width: 1em; }
.fa-layers svg.svg-inline--fa {
-webkit-transform-origin: center center;
transform-origin: center center; }
.fa-layers-text, .fa-layers-counter {
display: inline-block;
position: absolute;
text-align: center; }
.fa-layers-text {
left: 50%;
top: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
-webkit-transform-origin: center center;
transform-origin: center center; }
.fa-layers-counter {
background-color: #ff253a;
border-radius: 1em;
-webkit-box-sizing: border-box;
box-sizing: border-box;
color: #fff;
height: 1.5em;
line-height: 1;
max-width: 5em;
min-width: 1.5em;
overflow: hidden;
padding: .25em;
right: 0;
text-overflow: ellipsis;
top: 0;
-webkit-transform: scale(0.25);
transform: scale(0.25);
-webkit-transform-origin: top right;
transform-origin: top right; }
.fa-layers-bottom-right {
bottom: 0;
right: 0;
top: auto;
-webkit-transform: scale(0.25);
transform: scale(0.25);
-webkit-transform-origin: bottom right;
transform-origin: bottom right; }
.fa-layers-bottom-left {
bottom: 0;
left: 0;
right: auto;
top: auto;
-webkit-transform: scale(0.25);
transform: scale(0.25);
-webkit-transform-origin: bottom left;
transform-origin: bottom left; }
.fa-layers-top-right {
right: 0;
top: 0;
-webkit-transform: scale(0.25);
transform: scale(0.25);
-webkit-transform-origin: top right;
transform-origin: top right; }
.fa-layers-top-left {
left: 0;
right: auto;
top: 0;
-webkit-transform: scale(0.25);
transform: scale(0.25);
-webkit-transform-origin: top left;
transform-origin: top left; }
.fa-lg {
font-size: 1.33333em;
line-height: 0.75em;
vertical-align: -.0667em; }
.fa-xs {
font-size: .75em; }
.fa-sm {
font-size: .875em; }
.fa-1x {
font-size: 1em; }
.fa-2x {
font-size: 2em; }
.fa-3x {
font-size: 3em; }
.fa-4x {
font-size: 4em; }
.fa-5x {
font-size: 5em; }
.fa-6x {
font-size: 6em; }
.fa-7x {
font-size: 7em; }
.fa-8x {
font-size: 8em; }
.fa-9x {
font-size: 9em; }
.fa-10x {
font-size: 10em; }
.fa-fw {
text-align: center;
width: 1.25em; }
.fa-ul {
list-style-type: none;
margin-left: 2.5em;
padding-left: 0; }
.fa-ul > li {
position: relative; }
.fa-li {
left: -2em;
position: absolute;
text-align: center;
width: 2em;
line-height: inherit; }
.fa-border {
border: solid 0.08em #eee;
border-radius: .1em;
padding: .2em .25em .15em; }
.fa-pull-left {
float: left; }
.fa-pull-right {
float: right; }
.fa.fa-pull-left,
.fas.fa-pull-left,
.far.fa-pull-left,
.fal.fa-pull-left,
.fab.fa-pull-left {
margin-right: .3em; }
.fa.fa-pull-right,
.fas.fa-pull-right,
.far.fa-pull-right,
.fal.fa-pull-right,
.fab.fa-pull-right {
margin-left: .3em; }
.fa-spin {
-webkit-animation: fa-spin 2s infinite linear;
animation: fa-spin 2s infinite linear; }
.fa-pulse {
-webkit-animation: fa-spin 1s infinite steps(8);
animation: fa-spin 1s infinite steps(8); }
@-webkit-keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg); }
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg); } }
@keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg); }
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg); } }
.fa-rotate-90 {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
-webkit-transform: rotate(90deg);
transform: rotate(90deg); }
.fa-rotate-180 {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
-webkit-transform: rotate(180deg);
transform: rotate(180deg); }
.fa-rotate-270 {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
-webkit-transform: rotate(270deg);
transform: rotate(270deg); }
.fa-flip-horizontal {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
-webkit-transform: scale(-1, 1);
transform: scale(-1, 1); }
.fa-flip-vertical {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
-webkit-transform: scale(1, -1);
transform: scale(1, -1); }
.fa-flip-both, .fa-flip-horizontal.fa-flip-vertical {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
-webkit-transform: scale(-1, -1);
transform: scale(-1, -1); }
:root .fa-rotate-90,
:root .fa-rotate-180,
:root .fa-rotate-270,
:root .fa-flip-horizontal,
:root .fa-flip-vertical,
:root .fa-flip-both {
-webkit-filter: none;
filter: none; }
.fa-stack {
display: inline-block;
height: 2em;
position: relative;
width: 2.5em; }
.fa-stack-1x,
.fa-stack-2x {
bottom: 0;
left: 0;
margin: auto;
position: absolute;
right: 0;
top: 0; }
.svg-inline--fa.fa-stack-1x {
height: 1em;
width: 1.25em; }
.svg-inline--fa.fa-stack-2x {
height: 2em;
width: 2.5em; }
.fa-inverse {
color: #fff; }
.sr-only {
border: 0;
clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
overflow: hidden;
padding: 0;
position: absolute;
width: 1px; }
.sr-only-focusable:active, .sr-only-focusable:focus {
clip: auto;
height: auto;
margin: 0;
overflow: visible;
position: static;
width: auto; }
.svg-inline--fa .fa-primary {
fill: var(--fa-primary-color, currentColor);
opacity: 1;
opacity: var(--fa-primary-opacity, 1); }
.svg-inline--fa .fa-secondary {
fill: var(--fa-secondary-color, currentColor);
opacity: 0.4;
opacity: var(--fa-secondary-opacity, 0.4); }
.svg-inline--fa.fa-swap-opacity .fa-primary {
opacity: 0.4;
opacity: var(--fa-secondary-opacity, 0.4); }
.svg-inline--fa.fa-swap-opacity .fa-secondary {
opacity: 1;
opacity: var(--fa-primary-opacity, 1); }
.svg-inline--fa mask .fa-primary,
.svg-inline--fa mask .fa-secondary {
fill: black; }
.fad.fa-inverse {
color: #fff; }

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 730 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 2.5 MiB

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 2.3 MiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 2.1 MiB

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,62 @@
/* font converted using font-converter.net. thank you! */
.fm {
display: inline-block;
font-style: normal;
font-variant-ligatures: normal;
font-variant-caps: normal;
font-variant-numeric: normal;
font-variant-east-asian: normal;
font-weight: normal;
font-stretch: normal;
font-size: inherit;
line-height: 1;
font-family: FarmMaps;
text-rendering: auto;
}
.fm-farm:before {
content: "a";
}
.fm-potato:before {
content: "b";
}
.fm-trijntje:before {
content: "c";
}
.fm-satellite:before {
content: "d";
}
.fm-sensoterra:before {
content: "e";
}
.fm-blight:before {
content: "f";
}
.fm-agrodatacube:before {
content: "g";
}
.fm-app-menu:before {
content: "h";
}
.fm-blight-holes:before {
content: "i";
}
hallo
@font-face {
font-family: "FarmMaps";
src: url("./FMIconFont.woff") format("woff"), /* Modern Browsers */
url("./FMIconFont.woff2") format("woff2"); /* Modern Browsers */
font-weight: normal;
font-style: normal;
}

15560
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "farmmaps-lib-app",
"version": "0.0.0",
"version": "0.0.1",
"scripts": {
"ng": "ng",
"start": "ng serve",
@ -11,42 +11,63 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~7.2.0",
"@angular/common": "~7.2.0",
"@angular/compiler": "~7.2.0",
"@angular/core": "~7.2.0",
"@angular/forms": "~7.2.0",
"@angular/platform-browser": "~7.2.0",
"@angular/platform-browser-dynamic": "~7.2.0",
"@angular/router": "~7.2.0",
"core-js": "^2.5.4",
"rxjs": "~6.3.3",
"tslib": "^1.9.0",
"zone.js": "~0.8.26"
"@angular/animations": "~10.2.4",
"@angular/common": "~10.2.4",
"@angular/compiler": "~10.2.4",
"@angular/core": "~10.2.4",
"@angular/forms": "~10.2.4",
"@angular/platform-browser": "~10.2.4",
"@angular/platform-browser-dynamic": "~10.2.4",
"@angular/router": "~10.2.4",
"@farmmaps/common": ">=0.0.1-prerelease.575 <0.0.1",
"@farmmaps/common-map": ">=0.0.1-prerelease.575 <0.0.1",
"@farmmaps/common-map3d": ">=0.0.1-prerelease.575 <0.0.1",
"@microsoft/signalr": "^3.1.3",
"@ng-bootstrap/ng-bootstrap": "^7.0",
"@ngrx/effects": "^10.0",
"@ngrx/router-store": "^10.0",
"@ngrx/store": "^10.0",
"angular-oauth2-oidc": "^10.0.3",
"bootstrap": "^4.4.1",
"cesium": "^1.77.0",
"core-js": "^2.6.11",
"moment": "^2.27.0",
"ngrx-store-localstorage": "^10.0",
"ngx-avatar": "^4.0.0",
"ngx-clipboard": "^14.0.1",
"ngx-image-cropper": "^3.3.5",
"ngx-openlayers": "1.0.0-next.17",
"ngx-uploadx": "^3.5.1",
"ol": "6.5.0",
"ol-cesium": "^2.12.0",
"resumablejs": "^1.1.0",
"rxjs": "^6.5.4",
"tassign": "^1.0.0",
"tslib": "^2.0.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.13.0",
"@angular-devkit/build-ng-packagr": "~0.13.0",
"@angular/cli": "~7.3.8",
"@angular/compiler-cli": "~7.2.0",
"@angular/language-service": "~7.2.0",
"@types/node": "~8.9.4",
"@angular-builders/custom-webpack": "~10.0.1",
"@angular-devkit/build-angular": "^0.1002.1",
"@angular-devkit/build-ng-packagr": "~0.1002.1",
"@angular/cli": "^10.2.1",
"@angular/compiler-cli": "~10.2.4",
"@angular/language-service": "~10.2.4",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"codelyzer": "~4.5.0",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"ng-packagr": "^4.2.0",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tsickle": ">=0.34.0",
"tslib": "^1.9.0",
"tslint": "~5.11.0",
"typescript": "~3.2.2"
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^10.1.0",
"protractor": "~7.0.0",
"ts-node": "^8.8.1",
"tslint": "~6.1.0",
"typescript": "~4.0.3"
}
}

View File

@ -0,0 +1,24 @@
# CommonMap
This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.2.0.
## Code scaffolding
Run `ng generate component component-name --project common-map` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project common-map`.
> Note: Don't forget to add `--project common-map` or else it will be added to the default project in your `angular.json` file.
## Build
Run `ng build common-map` to build the project. The build artifacts will be stored in the `dist/` directory.
## Publishing
After building your library with `ng build common-map`, go to the dist folder `cd dist/common-map` and run `npm publish`.
## Running unit tests
Run `ng test common-map` to execute the unit tests via [Karma](https://karma-runner.github.io).
## Further help
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

View File

@ -0,0 +1,10 @@
{
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../dist/common-map",
"lib": {
"entryFile": "src/public-api.ts"
},
"whitelistedNonPeerDependencies": [
"."
]
}

View File

@ -0,0 +1,13 @@
{
"name": "@farmmaps/common-map",
"version": "0.0.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"tslib": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
}
}
}

View File

@ -0,0 +1,21 @@
{
"name": "@farmmaps/common-map",
"version": "1.0.0",
"publishConfig": {
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
},
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/core": "^10.2.4",
"ngrx-store-localstorage": "^10.0",
"@ngrx/effects": "^10.0",
"@ngrx/router-store": "^10.0",
"@ngrx/store": "^10.0",
"tassign": "^1.0.0",
"@farmmaps/common": ">=1.0.0.0",
"ngx-openlayers": "1.0.0-next.17",
"ol": "6.4.3"
}
}

View File

@ -0,0 +1,352 @@
import { Action } from '@ngrx/store';
import { IMapState } from '../models/map.state';
import { IItemLayer } from '../models/item.layer';
import { ILayervalue } from '../models/layer.value';
import { IQueryState } from '@farmmaps/common';
import { IItem } from '@farmmaps/common';
import { Feature,Style } from 'ol';
export const SETSTATE = '[Map] SetState';
export const SETMAPSTATE = '[Map] MapState';
export const SETVIEWEXTENT = '[Map] SetViewExtent';
export const INIT = '[Map] Init';
export const SETPARENT = '[Map] SetParent';
export const STARTSEARCH = '[Map] StartSearch';
export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
export const SELECTFEATURE = '[Map] SelectFeature';
export const SELECTITEM = '[Map] SelectItem';
export const SELECTITEMSUCCESS = '[Map] SelectItemSuccess';
export const SETSELECTEDITEMLAYER = '[Map] SetSelectedItemLayer';
export const SELECTTEMPORALITEMSSUCCESS = '[Map] SelectTemporalItemsSuccess';
export const NEXTTEMPORAL = '[Map] NextTemporal';
export const PREVIOUSTEMPORAL = '[Map] PreviousTemporal';
export const SELECTTEMPORAL = '[Map] SelectTemporal';
export const ADDFEATURESUCCESS = '[Map] AddFeatureSuccess';
export const UPDATEFEATURESUCCESS = '[Map] UpdateFeatureSuccess';
export const EXPANDSEARCH = '[Map] ExpandSearch';
export const COLLAPSESEARCH = '[Map] CollapseSearch';
export const SETEXTENT = '[Map] SetExtent';
export const SETQUERYSTATE = '[Map] SetQueryState';
export const SETTIMESPAN = '[Map] SetTimeSpan';
export const ADDLAYER = '[Map] AddLayer';
export const SETVISIBILITY = '[Map] SetVisibility';
export const SETOPACITY = '[Map] SetOpacity';
export const SETLAYERINDEX = '[Map] SetLayerIndex';
export const REMOVELAYER = '[Map] RemoveLayer';
export const CLEARLAYERS = '[Map] ClearLayers';
export const LOADBASELAYERS = '[Map] LoadLayers';
export const LOADBASELAYERSSUCCESS = '[Map] LoadLayersSuccess';
export const SELECTBASELAYER = '[Map] SelectBaseLayers';
export const SELECTOVERLAYLAYER = '[Map] SelectOverlayLayers';
export const ZOOMTOEXTENT = '[Map] ZoomToExtent';
export const DOQUERY = '[Map] DoQuery';
export const SETSTYLE = '[Map] SetStyle';
export const SHOWLAYERSWITCHER = '[Map] ShowLayerSwitcher';
export const CLEAR = '[Map] Clear';
export const SETREPLACEURL = '[Map] SetReplaceUrl';
export const SETFEATURES = '[Map] SetFeatures'
export const SETLAYERVALUESLOCATION = '[Map] SetLayerValuesLocation'
export const TOGGLELAYERVALUESENABLED = '[Map] ToggleLayerValuesEnabled'
export const GETLAYERVALUE = '[Map] GetLayerValue'
export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
export class Clear implements Action {
readonly type = CLEAR;
constructor() {}
}
export class SetState implements Action {
readonly type = SETSTATE;
constructor(public mapState: IMapState,public queryState:IQueryState) { }
}
export class SetMapState implements Action {
readonly type = SETMAPSTATE;
constructor(public mapState: IMapState) { }
}
export class SetViewExtent implements Action {
readonly type = SETVIEWEXTENT;
constructor(public extent:number[]) { }
}
export class Init implements Action {
readonly type = INIT;
constructor() { }
}
export class SetParent implements Action {
readonly type = SETPARENT;
constructor(public parentCode:string) { }
}
export class StartSearch implements Action {
readonly type = STARTSEARCH;
constructor(public queryState: IQueryState) { }
}
export class StartSearchSuccess implements Action {
readonly type = STARTSEARCHSUCCESS;
constructor(public features: Array<Feature>, public query:IQueryState) { }
}
export class SelectFeature implements Action {
readonly type = SELECTFEATURE;
constructor(public feature:Feature) { }
}
export class SelectItem implements Action {
readonly type = SELECTITEM;
constructor(public itemCode:string) { }
}
export class SelectItemSuccess implements Action {
readonly type = SELECTITEMSUCCESS;
constructor(public item: IItem, public parentItem: IItem) { }
}
export class SelectTemporalItemsSuccess implements Action {
readonly type = SELECTTEMPORALITEMSSUCCESS;
constructor(public temporalItems: IItem[]) { }
}
export class NextTemporal implements Action {
readonly type = NEXTTEMPORAL;
constructor() { }
}
export class PreviousTemporal implements Action {
readonly type = PREVIOUSTEMPORAL;
constructor() { }
}
export class SelectTemporal implements Action {
readonly type = SELECTTEMPORAL;
constructor(item:IItem) { }
}
export class AddFeatureSuccess implements Action {
readonly type = ADDFEATURESUCCESS;
constructor(public feature: Feature) { }
}
export class UpdateFeatureSuccess implements Action {
readonly type = UPDATEFEATURESUCCESS;
constructor(public feature: Feature) { }
}
export class ExpandSearch implements Action {
readonly type = EXPANDSEARCH;
constructor() { }
}
export class CollapseSearch implements Action {
readonly type = COLLAPSESEARCH;
constructor() { }
}
export class SetExtent implements Action {
readonly type = SETEXTENT;
constructor(public extent:number[]) { }
}
export class SetQueryState implements Action {
readonly type = SETQUERYSTATE;
constructor(public queryState: IQueryState,public replaceUrl:boolean = true) { }
}
export class SetTimeSpan implements Action {
readonly type = SETTIMESPAN;
constructor(public startDate: Date, public endDate: Date) { }
}
export class AddLayer implements Action {
readonly type = ADDLAYER;
constructor(public item:IItem,public layerIndex=-1) { }
}
export class SetSelectedItemLayer implements Action {
readonly type = SETSELECTEDITEMLAYER;
constructor(public item:IItem,public layerIndex=-1) { }
}
export class SetVisibility implements Action {
readonly type = SETVISIBILITY;
constructor(public itemLayer:IItemLayer,public visibility:boolean) { }
}
export class SetOpacity implements Action {
readonly type = SETOPACITY;
constructor(public itemLayer: IItemLayer, public opacity: number) { }
}
export class SetLayerIndex implements Action {
readonly type = SETLAYERINDEX;
constructor(public layerIndex: number, public itemLayer: IItemLayer = null) { }
}
export class RemoveLayer implements Action {
readonly type = REMOVELAYER;
constructor(public itemLayer: IItemLayer) { }
}
export class ClearLayers implements Action {
readonly type = CLEARLAYERS;
constructor() { }
}
export class LoadBaseLayers implements Action {
readonly type = LOADBASELAYERS;
constructor(public projection: string) { }
}
export class LoadBaseLayersSuccess implements Action {
readonly type = LOADBASELAYERSSUCCESS;
constructor(public items: IItem[] ) { }
}
export class SelectBaseLayer implements Action {
readonly type = SELECTBASELAYER;
constructor(public itemLayer: IItemLayer) { }
}
export class SelectOverlayLayer implements Action {
readonly type = SELECTOVERLAYLAYER;
constructor(public itemLayer: IItemLayer) { }
}
export class ZoomToExtent implements Action {
readonly type = ZOOMTOEXTENT;
constructor(public itemLayer: IItemLayer) { }
}
export class DoQuery implements Action {
readonly type = DOQUERY;
constructor(public query:IQueryState) { }
}
export class SetStyle implements Action {
readonly type = SETSTYLE;
constructor(public itemType:string,public style: Style | (Feature)) { }
}
export class ShowLayerSwitcher implements Action {
readonly type = SHOWLAYERSWITCHER;
constructor(public show:boolean) {}
}
export class SetReplaceUrl implements Action {
readonly type = SETREPLACEURL;
constructor(public replaceUrl:boolean) {}
}
export class SetFeatures implements Action {
readonly type = SETFEATURES;
constructor(public features: Array<Feature>) { }
}
export class SetLayerValuesLocation implements Action {
readonly type = SETLAYERVALUESLOCATION;
constructor(public x:number, public y:number) { }
}
export class ToggleLayerValuesEnabled implements Action {
readonly type = TOGGLELAYERVALUESENABLED;
constructor() { }
}
export class GetLayerValue implements Action {
readonly type = GETLAYERVALUE;
constructor(public itemLayer:IItemLayer,public x:number,public y:number) { }
}
export class GetLayerValueSuccess implements Action {
readonly type = GETLAYERVALUESUCCESS;
constructor(public layervalue:ILayervalue) { }
}
export type Actions = SetMapState
| Init
| Clear
| SetParent
| StartSearch
| StartSearchSuccess
| SelectFeature
| SelectItem
| SelectItemSuccess
| SelectTemporalItemsSuccess
| NextTemporal
| PreviousTemporal
| SelectTemporal
| AddFeatureSuccess
| UpdateFeatureSuccess
| ExpandSearch
| CollapseSearch
| SetExtent
| SetQueryState
| SetTimeSpan
| AddLayer
| RemoveLayer
| ClearLayers
| SetVisibility
| SetOpacity
| SetLayerIndex
| LoadBaseLayers
| LoadBaseLayersSuccess
| SelectBaseLayer
| SelectOverlayLayer
| ZoomToExtent
| SetState
| SetViewExtent
| DoQuery
| SetStyle
| ShowLayerSwitcher
| SetReplaceUrl
| SetFeatures
| SetSelectedItemLayer
| SetLayerValuesLocation
| ToggleLayerValuesEnabled
| GetLayerValueSuccess
| GetLayerValue;

View File

@ -0,0 +1,29 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { MapComponent } from './components/map/map.component';
import { AuthGuard } from '@farmmaps/common';
const routes = [
{
path: '',
component: MapComponent
},
{
path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer',
component: MapComponent
},
{
path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState',
component: MapComponent
},
{
path: ':queryState',
component: MapComponent
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class MapRoutingModule { }

View File

@ -0,0 +1,292 @@
import { NgModule ,ModuleWithProviders} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
//external modules
import { AngularOpenlayersModule } from 'ngx-openlayers';
import { StoreModule, ActionReducer, MetaReducer } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
//common modules
import { AppCommonModule } from '@farmmaps/common';
import { MODULE_NAME } from './module-name';
import * as mapReducers from './reducers/map.reducer';
import * as mapActions from './actions/map.actions';
import * as mapEffects from './effects/map.effects';
import { IMapState} from './models/map.state';
import { ISelectedFeatures } from './models/selected.features';
import { IItemLayer,ItemLayer,ITemporalItemLayer,TemporalItemLayer } from './models/item.layer';
import { IPeriodState } from './models/period.state';
// components
import { GpsLocation} from './components/aol/gps-location/gps-location.component';
import {FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component';
import { FeatureListFeatureCroppingschemeComponent} from './components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component';
import { ItemWidgetListComponent} from './components/item-widget-list/item-widget-list.component';
import { AbstractItemListItemComponent, ItemListItemComponent, AbstractItemWidgetComponent } from './components/item-list-item/item-list-item.component';
import { ItemListItemContainerComponent } from './components/item-list-item-container/item-list-item-container.component';
import { AbstractItemListComponent,ItemListComponent} from './components/item-list/item-list.component';
import { AbstractSelectedItemComponent, SelectedItemComponent } from './components/selected-item/selected-item.component';
import { SelectedItemCropfieldComponent } from './components/selected-item-cropfield/selected-item-cropfield.component';
import { SelectedItemGeotiffComponent } from './components/selected-item-geotiff/selected-item-geotiff.component';
import { SelectedItemTemporalComponent} from './components/selected-item-temporal/selected-item-temporal.component';
import {SelectedItemShapeComponent } from './components/selected-item-shape/selected-item-shape.component';
import { SelectedItemContainerComponent } from './components/selected-item-container/selected-item-container.component';
import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from './components/feature-list-feature/feature-list-feature.component';
import {FeatureListFeatureContainerComponent } from './components/feature-list-feature-container/feature-list-feature-container.component';
import { FeatureListCroppingschemeComponent } from './components/feature-list-croppingscheme/feature-list-croppingscheme.component';
import {FeatureListCropfieldComponent } from './components/feature-list-cropfield/feature-list-cropfield.component';
import {FeatureListContainerComponent } from './components/feature-list-container/feature-list-container.component';
import { WidgetHostDirective} from './components/widget-host/widget-host.directive';
import { FeatureListComponent,AbstractFeatureListComponent} from './components/feature-list/feature-list.component';
import { FileDropTargetComponent } from './components/aol/file-drop-target/file-drop-target.component';
import { ItemVectorSourceComponent } from './components/aol/item-vector-source/item-vector-source.component';
import { ItemLayersComponent } from './components/aol/item-layers/item-layers.component';
import { ZoomToExtentComponent } from './components/aol/zoom-to-extent/zoom-to-extent.component';
import { RotationResetComponent } from './components/aol/rotation-reset/rotation-reset.component';
import { LayerListComponent } from './components/aol/layer-list/layer-list.component';
import { MetaDataModalComponent } from './components/meta-data-modal/meta-data-modal.component';
import { SelectPeriodModalComponent } from './components/select-period-modal/select-period-modal.component';
import { MapComponent } from './components/map/map.component';
import { MapSearchComponent } from './components/map-search/map-search.component';
import { MapRoutingModule } from './common-map-routing.module';
import { LegendComponent } from './components/legend/legend.component';
import { LayerVectorImageComponent } from './components/aol/layer-vector-image/layer-vector-image.component';
import {FeatureIconService} from './services/feature-icon.service';
import { GeolocationService } from './services/geolocation.service';
import {DeviceOrientationService} from './services/device-orientation.service';
import { TemporalService} from './services/temporal.service';
import { WidgetStatusComponent } from './components/widget-status/widget-status.component';
import { ForChild} from './components/for-item/for-child.decorator';
import {ForItemType } from './components/for-item/for-itemtype.decorator';
import { ForSourceTask} from './components/for-item/for-sourcetask.decorator';
import { ForPackage } from './components/for-item/for-package.decorator';
import { PanToLocation} from './components/aol/pan-to-location/pan-to-location.component';
import {LayerSwitcher} from './components/layer-switcher/layer-switcher.component';
import {HistogramDetailsComponent} from './components/legend/histogram-details/histogram-details.component';
import {StatisticsDetailsComponent} from './components/legend/statistics-details/statistics-details.component';
import { ifZoomToShowDirective} from './components/if-zoom-to-show/if-zoom-to-show.directive';
import { ZoomToShowAlert} from './components/zoom-to-show-alert/zoom-to-show-alert.component';
import { LayerValuesComponent } from './components/aol/layer-values/layer-values.component';
import { GeometryThumbnailComponent } from './components/feature-thumbnail/feature-thumbnail.component';
export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any> {
const r = function(state, action) {
const r2 = reducer(state, action);
if(action.type == "@ngrx/store/update-reducers") {
let ms = window.localStorage.getItem(MODULE_NAME+"_mapState");
if(ms) {
r2["mapState"] = JSON.parse(ms);
}
}
if(action.type == "[Map] MapState" || action.type == "[Map] SetState") {
window.localStorage.setItem(MODULE_NAME + "_mapState",JSON.stringify(r2["mapState"]));
}
return r2;
};
return r;
}
const metaReducers: Array<MetaReducer<any, any>> = [LocalStorageSync];
export {
mapEffects,
mapReducers,
mapActions,
ZoomToExtentComponent,
ItemVectorSourceComponent,
ItemLayersComponent,
FileDropTargetComponent,
MapComponent,
MetaDataModalComponent,
RotationResetComponent,
MapSearchComponent,
SelectPeriodModalComponent,
LayerListComponent,
LegendComponent,
LayerVectorImageComponent,
FeatureListComponent,
WidgetHostDirective,
FeatureListContainerComponent,
FeatureListCroppingschemeComponent,
FeatureListCropfieldComponent,
FeatureListFeatureContainerComponent,
FeatureListFeatureComponent,
FeatureListFeatureCroppingschemeComponent,
FeatureListFeatureCropfieldComponent,
SelectedItemContainerComponent,
SelectedItemComponent,
SelectedItemCropfieldComponent,
SelectedItemGeotiffComponent,
SelectedItemTemporalComponent,
SelectedItemShapeComponent,
ItemListItemComponent,
ItemListItemContainerComponent,
ItemListComponent,
ItemWidgetListComponent,
WidgetStatusComponent,
GpsLocation,
PanToLocation,
LayerSwitcher,
AbstractFeatureListComponent,
AbstractFeatureListFeatureComponent,
AbstractSelectedItemComponent,
AbstractItemWidgetComponent,
AbstractItemListItemComponent,
AbstractItemListComponent,
FeatureIconService,
GeolocationService,
DeviceOrientationService,
TemporalService,
IMapState,
ISelectedFeatures,
IItemLayer,
ItemLayer,
IPeriodState,
ForChild,
ForItemType,
ForSourceTask,
ForPackage ,
ITemporalItemLayer,
TemporalItemLayer,
ifZoomToShowDirective,
ZoomToShowAlert
}
@NgModule({
imports: [
CommonModule,
AngularOpenlayersModule,
MapRoutingModule,
StoreModule.forFeature(MODULE_NAME, mapReducers.reducer,{metaReducers:metaReducers}),
EffectsModule.forFeature([mapEffects.MapEffects]),
NgbModule,
FormsModule,
ReactiveFormsModule,
AppCommonModule
],
declarations: [
ZoomToExtentComponent,
ItemVectorSourceComponent,
ItemLayersComponent,
FileDropTargetComponent,
MapComponent,
MetaDataModalComponent,
RotationResetComponent,
MapSearchComponent,
SelectPeriodModalComponent,
LayerListComponent,
LegendComponent,
LayerVectorImageComponent,
FeatureListComponent,
WidgetHostDirective,
FeatureListContainerComponent,
FeatureListCroppingschemeComponent,
FeatureListCropfieldComponent,
FeatureListFeatureContainerComponent,
FeatureListFeatureComponent,
FeatureListFeatureCroppingschemeComponent,
FeatureListFeatureCropfieldComponent,
SelectedItemContainerComponent,
SelectedItemComponent,
SelectedItemCropfieldComponent,
SelectedItemGeotiffComponent,
SelectedItemTemporalComponent,
SelectedItemShapeComponent,
ItemListItemComponent,
ItemListItemContainerComponent,
ItemListComponent,
ItemWidgetListComponent,
WidgetStatusComponent,
GpsLocation,
PanToLocation,
LayerSwitcher,
HistogramDetailsComponent,
StatisticsDetailsComponent,
ifZoomToShowDirective,
ZoomToShowAlert,
LayerValuesComponent,
GeometryThumbnailComponent
],
entryComponents: [
FeatureListComponent,
FeatureListCroppingschemeComponent,
FeatureListCropfieldComponent,
FeatureListFeatureComponent,
FeatureListFeatureCroppingschemeComponent,
FeatureListFeatureCropfieldComponent,
SelectedItemComponent,
SelectedItemCropfieldComponent,
SelectedItemGeotiffComponent,
SelectedItemTemporalComponent,
SelectedItemShapeComponent,
ItemListComponent,
ItemListItemComponent,
],
exports: [
ItemVectorSourceComponent,
ItemLayersComponent,
FileDropTargetComponent,
MetaDataModalComponent,
MapComponent,
GpsLocation,
PanToLocation,
LayerSwitcher,
FeatureListFeatureComponent,
FeatureListFeatureCropfieldComponent,
FeatureListFeatureCroppingschemeComponent,
SelectedItemContainerComponent,
SelectedItemComponent,
SelectedItemCropfieldComponent,
SelectedItemGeotiffComponent,
SelectedItemTemporalComponent,
SelectedItemShapeComponent,
ItemListItemComponent,
ItemListItemContainerComponent,
ItemListComponent,
ItemWidgetListComponent,
WidgetStatusComponent,
RotationResetComponent,
MapSearchComponent,
SelectPeriodModalComponent,
LayerListComponent,
LegendComponent,
LayerVectorImageComponent,
FeatureListComponent,
WidgetHostDirective,
FeatureListContainerComponent,
FeatureListCroppingschemeComponent,
FeatureListCropfieldComponent,
FeatureListFeatureContainerComponent,
ZoomToExtentComponent,
ifZoomToShowDirective,
ZoomToShowAlert
],
providers: [
FeatureIconService,
GeolocationService,
DeviceOrientationService,
TemporalService,
{ provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
{ provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
{ provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
{ provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
]
})
export class AppCommonMapModule {
}

View File

@ -0,0 +1,73 @@
import { Component, Input, OnDestroy, OnInit, EventEmitter, Output, Inject } from '@angular/core';
import { MapComponent } from 'ngx-openlayers';
import * as proj from 'ol/proj';
import {Point,Geometry} from 'ol/geom';
import { GeoJSON } from 'ol/format';
import { Feature } from 'ol';
export interface IDroppedFile {
files: any,
event: any,
geometry: any
parentCode: string;
}
@Component({
selector: 'fm-map-file-drop-target',
template: ''
})
export class FileDropTargetComponent implements OnInit, OnDestroy {
element: Element;
@Output() onFileDropped = new EventEmitter<IDroppedFile>();
@Input() parentCode: string;
@Input() features: Array<Feature>;
constructor(private map: MapComponent) {
}
ngOnInit() {
this.element = this.map.instance.getViewport();
let other = this;
this.element.addEventListener('drop', this.onDrop, false);
this.element.addEventListener('dragover', this.preventDefault, false);
this.element.addEventListener('dragenter', this.preventDefault, false);
}
private onDrop = (event: DragEvent) => {
this.stopEvent(event);
let geojsonFormat = new GeoJSON();
var parentCode = this.parentCode;
var coordinate = this.map.instance.getEventCoordinate(event);
//coordinate = proj.transform(coordinate, this.map.instance.getView().getProjection(), 'EPSG:4326');
var geometry:Geometry = new Point(coordinate);
var hitFeatures = this.map.instance.getFeaturesAtPixel([event.pageX, event.pageY]);
var hitFeature = hitFeatures && hitFeatures.length > 0 ? hitFeatures[0] : null;
if (hitFeature) {
if (hitFeature.get("code")) {
parentCode = hitFeature.get("code");
}
geometry = geojsonFormat.readGeometry(geojsonFormat.writeGeometry(geometry)); // create copy instead of reference
}
var projectedGeometry = geometry.transform(this.map.instance.getView().getProjection(), 'EPSG:4326');
if (event.dataTransfer && event.dataTransfer.files) {
this.onFileDropped.emit({ files: event.dataTransfer.files, event: event, geometry: JSON.parse(geojsonFormat.writeGeometry(projectedGeometry)),parentCode:parentCode})
}
}
private preventDefault(event) {
event.preventDefault();
}
private stopEvent(event) {
event.stopPropagation();
event.preventDefault();
}
ngOnDestroy() {
this.element.removeEventListener('drop', this.onDrop);
this.element.removeEventListener('dragover', this.preventDefault);
this.element.removeEventListener('dragenter', this.preventDefault);
}
}

View File

@ -0,0 +1,15 @@
<div class="gps-location">
<svg #location height="1000" width="1000">
<defs>
<linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%">
<stop offset="0%" class="stop1" />
<stop offset="100%" class="stop2" />
</linearGradient>
</defs>
<circle class="tolerance hidden" [ngClass]="{'hidden':!showTolerance}" cx="500" cy="500" stroke="none" [attr.r]="locTolerancePixels" />
<path class="heading hidden" [ngClass]="{'hidden': !showHeading }" stroke="none" [attr.d]="path" fill="url(#grad1)" [attr.transform]="rotate"></path>
<circle class="border" cx="500" cy="500" r="7" stroke="none" />
<circle class="center" cx="500" cy="500" r="6" stroke="none" />
</svg>
</div>

View File

@ -0,0 +1,43 @@
@import "~bootstrap/scss/bootstrap.scss";
.gps-location {
display:none;
}
.center, .tolerance, .border {
stroke-width: 0;
}
.heading.hidden {
display: none;
}
.tolerance {
fill: $primary;
fill-opacity:0.4;
}
.tolerance.hidden {
display: none
}
.border {
fill: $white;
}
.center {
fill: $primary;
}
.stop1 {
stop-color: $primary;
stop-opacity:1;
}
.stop2 {
stop-color:$primary;
stop-opacity: 0;
}

View File

@ -0,0 +1,75 @@
import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges ,Host} from '@angular/core';
import { MapComponent } from 'ngx-openlayers';
import Overlay from 'ol/Overlay';
import { fromLonLat, toLonLat } from 'ol/proj';
@Component({
selector: 'fm-map-gps-location',
templateUrl: './gps-location.component.html',
styleUrls: ['./gps-location.component.scss']
})
export class GpsLocation implements OnInit,OnChanges{
@Input() enable:boolean;
public instance: Overlay;
@Input() position: Position;
@Input() location: number[]=[0,0];
@Input() locationTolerance: number = 0;
@Input() showHeading: boolean = false;
@Input() showTolerance: boolean = false;
@Input() heading: number = 0;
@Input() headingTolerance: number = 0;
public locTolerancePixels: number = 0;
public path: string = "";
public rotate: string = "";
private resolution: number = 0;
initialized:boolean = false;
@ViewChild('location', { static: true }) locationElement: ElementRef;
constructor(private map: MapComponent) {
}
recalcLocationTolerance() {
this.locTolerancePixels = this.resolution >0? this.locationTolerance / this.resolution:0;
}
ngOnInit() {
this.instance = new Overlay({
stopEvent:false,
positioning: 'center-center',
position: fromLonLat( this.location),
element: this.locationElement.nativeElement
});
var x = Math.tan(this.headingTolerance * Math.PI / 180)*40;
var y = Math.cos(this.headingTolerance * Math.PI / 180) * 40;
var y1 = Math.round(500 - y);
var x1 = Math.round(500 - x);
var y2 = Math.round(y1);
var x2 = Math.round(500 + x);
this.path = "M " + x2 + " " + y2 + " A 45 45,0,0,0, " + x1 + " " + y1 + " L 493 500 L 507 500 Z";
this.rotate = "rotate(" + Math.round(this.heading) + " 500 500)";
this.locTolerancePixels = this.locationTolerance;
this.map.instance.addOverlay(this.instance);
this.map.instance.getView().on('change:resolution', (evt) => {
this.resolution = evt.target.get('resolution');
this.recalcLocationTolerance();
});
this.initialized = true;
}
ngOnChanges(changes: SimpleChanges) {
if (changes.position && this.instance) {
var p = changes.position.currentValue as Position;
if(p && this.initialized) {
this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
this.locationTolerance = p.coords.accuracy;
this.recalcLocationTolerance();
}
}
if(changes.heading && this.instance) {
this.rotate = "rotate(" + Math.round(changes.heading.currentValue) + " 500 500)";
}
}
}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,479 @@
import { Component, Host, Input, Output, EventEmitter,OnDestroy, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
import { LayerGroupComponent, MapComponent } from 'ngx-openlayers';
import { ItemService,IItem,AppConfig } from '@farmmaps/common';
import { IItemLayer, ITemporalItemLayer} from '../../../models/item.layer';
import { ILayerData} from '../../../models/layer.data';
import { IRenderoutputTiles,IRenderoutputImage,IGradientstop,ILayer,IHistogram,IColor} from '../../../models/color.map';
import {Extent} from 'ol/extent';
import Projection from 'ol/proj/Projection';
import * as proj from 'ol/proj';
import * as loadingstrategy from 'ol/loadingstrategy';
import * as style from 'ol/style';
import {Tile,Layer,Image} from 'ol/layer';
import {XYZ,ImageStatic,OSM,BingMaps,TileWMS,TileArcGISRest,TileJSON} from 'ol/source';
import {Vector as VectorSource} from 'ol/source';
import { Vector as VectorLayer } from 'ol/layer';
import VectorTileSource from 'ol/source/VectorTile';
import VectorTileLayer from 'ol/layer/VectorTile';
import {GeoJSON,MVT} from 'ol/format';
@Component({
selector: 'fm-map-item-layers',
template: `<ng-content></ng-content>`,
providers: [
{ provide: LayerGroupComponent, useExisting: forwardRef(() => ItemLayersComponent) }
]
})
export class ItemLayersComponent extends LayerGroupComponent implements OnChanges, OnInit,OnDestroy {
@Input() itemLayers: IItemLayer[];
@Input() itemLayer: IItemLayer;
@Output() onFeatureSelected: EventEmitter<any> = new EventEmitter<any>();
@Output() onFeatureHover: EventEmitter<any> = new EventEmitter<any>();
private _apiEndPoint: string;
private initialized:boolean = false;
private mapEventHandlerInstalled = false;
private selectedFeatures = {};
private selectionLayer:Layer = null;
constructor(private itemService: ItemService, private map: MapComponent, public appConfig: AppConfig) {
super(map);
this._apiEndPoint = appConfig.getConfig("apiEndPoint");
}
private styleCache = {}
componentToHex(c) {
var hex = c.toString(16);
return hex.length == 1 ? "0" + hex : hex;
}
rgbaToHex(r, g, b,a) {
return "#" + this.componentToHex(r) + this.componentToHex(g) + this.componentToHex(b) + this.componentToHex(a);
}
getColorFromGradient(layer: ILayer, value: number): IColor {
var gradient: IGradientstop[] = layer.renderer.colorMap.gradient;
var histogram: IHistogram = layer.renderer.band.histogram;
var index = (value - histogram.min) / histogram.max;
var min = gradient[0];
var max = gradient[gradient.length - 1];
for (var n = 0; n < gradient.length; n++) {
var s = gradient[n];
if (s.relativestop <= index && min.relativestop < s.relativestop && n < gradient.length - 1) min = s;
if (s.relativestop >= index && max.relativestop > s.relativestop && n > 0) max = s;
}
var i = index - min.relativestop;
var size = max.relativestop - min.relativestop;
var alpha = Math.round(min.color.alpha + ((max.color.alpha - min.color.alpha) * i / size));
var red = Math.round(min.color.red + ((max.color.red - min.color.red) * i / size));
var green = Math.round(min.color.green + ((max.color.green - min.color.green) * i / size));
var blue = Math.round(min.color.blue + ((max.color.blue - min.color.blue) * i / size));
return { alpha: alpha, red: red, green: green, blue: blue };
}
getColorForValue(layer: ILayer, value: number): IColor {
var color: IColor = { alpha:0,red:0,green:0,blue:0};
if(layer.renderer.colorMap.entries.length>0) {
color=layer.renderer.colorMap.noValue;
}
layer.renderer.colorMap.entries.forEach((entry) => {
if(entry.value==value) {
color =entry.color;
return;
}
});
return color;
}
getColor(item: IItem, layer: ILayer, feature): style.Style {
var value = layer.indexKey ? feature.get(layer.indexKey) : feature.get(layer.name);
var key = item.code + "_" + value;
if (!this.styleCache[key]) {
var color: IColor;
if(layer.renderer.colorMap.colormapType == "manual") {
color = this.getColorForValue(layer, value);
} else {
color = this.getColorFromGradient(layer, value);
}
this.styleCache[key] = new style.Style(
{
image: new style.Circle({
fill: new style.Fill({
color: this.rgbaToHex(color.red, color.green, color.blue, color.alpha)
}),
radius: 3
}),
fill: new style.Fill({
color: this.rgbaToHex(color.red, color.green, color.blue, color.alpha)
}),
stroke: new style.Stroke({
color: this.rgbaToHex(color.red, color.green, color.blue, 255),
width: 1.25
}),
});
}
return this.styleCache[key];
}
createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer {
var layerIndex = -1;
var layer: Layer = null;
layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
layer = new Tile({ source: source });
var data = item.data;
var l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null;
if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
var rt = l.rendering as IRenderoutputTiles;
let source = new XYZ({crossOrigin: 'use-credentials', maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
layer = new Tile({ source: source });
}
if (l && l.rendering && l.rendering.renderoutputType == "Image") {
var ri = l.rendering as IRenderoutputImage;
// convert to EPSG:4326 asworkaround for cesium
var projectedExtent = proj.transformExtent( ri.extent, 'EPSG:3857','EPSG:4326');
let source = new ImageStatic({ imageExtent:projectedExtent,projection:'EPSG:4326', crossOrigin: 'use-credentials', url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${Date.parse(item.updated)}` });
layer = new Image({ source: source });
}
return layer;
}
createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer {
var layerIndex = -1;
var layer: Layer = null;
layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
var data = item.data;
var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") {
var rt = l.rendering as IRenderoutputTiles;
layer = new VectorTileLayer({
declutter: true,
source: new VectorTileSource({
maxZoom: rt.maxzoom,
minZoom: rt.minzoom,
format: new MVT(),
url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/{z}/{x}/{y}.pbf?v=${Date.parse(item.updated)}`
}),
style: (feature) => {
return this.getColor(item,l, feature);
}
})
} else if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
var rt = l.rendering as IRenderoutputTiles;
layer = new Tile({
source: new XYZ({
maxZoom: rt.maxzoom,
minZoom: rt.minzoom,
url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/image_tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}`
})
});
} else {
let __this = this;
let format = new GeoJSON();
let source = new VectorSource({
strategy: loadingstrategy.bbox,
loader: function (extent: Extent, resolution: number, projection: Projection) {
var source = this as VectorSource;
__this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
var features = format.readFeatures(data);
for (let f of features) {
if (f.get("code")) {
f.setId(f.get("code"));
}
}
source.addFeatures(features);
});
}
});
layer = new VectorLayer({
source: source,
style: (feature) => {
var key =feature.get("code") + "_" + feature.get("color");
if (!this.styleCache[key]) {
var color = feature.get("color");
this.styleCache[key] = new style.Style(
{
fill: new style.Fill({
color: color
}),
stroke: new style.Stroke({
color: color,
width: 1.25
}),
image: new style.Circle({
fill: new style.Fill({
color: color
}),
stroke: new style.Stroke({
color: color,
width: 1.25
}),
radius: 5
}),
}
)
}
return this.styleCache[key];
}
});
}
if(l.minzoom) {
layer.setMinZoom(l.minzoom);
}
if(l.maxzoom) {
layer.setMaxZoom(l.maxzoom);
}
return layer;
}
createSelectionLayer(itemLayer:IItemLayer):Layer {
var layerIndex = -1;
var layer: Layer = null;
layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
var data = itemLayer.item.data;
var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") {
return new VectorTileLayer({
renderMode: 'vector',
source: itemLayer.layer.getSource(),
style: (feature) => {
if (feature.getId() in this.selectedFeatures) {
return new style.Style(
{
stroke: new style.Stroke({
color: 'red',
width: 2
})
}
);
}
},
minZoom: itemLayer.layer.getMinZoom(),
maxZoom: itemLayer.layer.getMaxZoom()
});
}
return null;
}
createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer {
let data = item.data as ILayerData;
var layer: Layer = null;
switch (data.interfaceType) {
case 'OSM': {
let source = new OSM();
layer = new Tile({ source: source });
break;
}
case 'BingMaps': {
let source = new BingMaps(data.options);
layer = new Tile({ source: source });
break;
}
case 'TileWMS': {
let source = new TileWMS(data.options);
layer = new Tile({ source: source });
break;
}
case 'TileJSON': {
let source = new TileJSON(data.options);
layer = new Tile({ source: source });
break;
}
case 'TileArcGISRest': {
let source = new TileArcGISRest(data.options);
layer = new Tile({ source: source });
break;
}
case 'VectorWFSJson': {
let source = new VectorSource({
format: new GeoJSON(),
url: function (extent) {
return (
data.options.url + '&srsname=' + data.projection +
'&bbox=' +
extent.join(',') +
',EPSG:3857'
);
},
strategy: loadingstrategy.bbox,
});
layer = new VectorLayer({ source: source });
break;
}
default: {
break;
}
}
return layer;
}
createLayer(itemLayer: IItemLayer): Layer {
var layer: Layer = null;
var layerIndex = -1;
if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
layer = this.createGeotiffLayer(itemLayer.item,itemLayer);
} else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
layer = this.createShapeLayer(itemLayer.item,itemLayer);
} else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.layer') {
layer = this.createExternalLayer(itemLayer.item,itemLayer);
}
if (layer) {
let geometry = new GeoJSON().readGeometry(itemLayer.item.geometry);
let extent = geometry ? proj.transformExtent(geometry.getExtent(), 'EPSG:4326', 'EPSG:3857') : null;
if (extent) layer.setExtent(extent);
}
return layer;
}
ngOnInit() {
super.ngOnInit();
if(this.itemLayers) {
this.updateLayers(this.itemLayers);
} else if(this.itemLayer) {
if(this.getItemlayer(this.itemLayer).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
this.installMapEventHandler();
}
this.updateLayers([this.itemLayer])
} else {
this.updateLayers([]);
}
this.initialized=true;
}
installMapEventHandler() {
if(!this.mapEventHandlerInstalled) {
this.map.instance.on(['click', 'pointermove'],this.mapEventHandler);
this.mapEventHandlerInstalled=true;
}
}
unInstallMapEventHandler() {
if(this.mapEventHandlerInstalled) {
this.map.instance.un(['click', 'pointermove'],this.mapEventHandler);
this.mapEventHandlerInstalled=false;
}
}
addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer {
if(!itemLayer) return null;
var olLayers = this.instance.getLayers();
var layer = itemLayer.layer;
let olIndex = olLayers.getArray().indexOf(layer);
if (olIndex < 0) {
// New layer: we add it to the map
layer = this.createLayer(itemLayer);
if (layer) {
olLayers.insertAt(index, layer);
}
} else if (index !== olIndex) {
// layer has moved inside the layers list
olLayers.removeAt(olIndex);
olLayers.insertAt(index, layer);
}
if(layer) {
itemLayer.layer = layer;
layer.setOpacity(itemLayer.opacity);
layer.setVisible(itemLayer.visible);
}
return layer;
}
updateLayers(itemLayers: IItemLayer[]) {
let newLayers: IItemLayer[] = [];
if (itemLayers) {
itemLayers.forEach((itemLayer, index) => {
if(itemLayer.item.itemType == 'vnd.farmmaps.itemtype.temporal') {
let il = itemLayer as ITemporalItemLayer;
let previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length);
if(previousLayer) newLayers.push(previousLayer);
let selectedLayer = this.addOrUpdateOlLayer(il.selectedItemLayer,newLayers.length);
if(selectedLayer) newLayers.push(selectedLayer);
let nextLayer = this.addOrUpdateOlLayer(il.nextItemLayer,newLayers.length);
if(nextLayer) newLayers.push(nextLayer);
} else {
let layer = this.addOrUpdateOlLayer(itemLayer,newLayers.length);
if(layer) newLayers.push(layer);
}
});
// Remove the layers that have disapeared from childrenLayers
var olLayers = this.instance.getLayers();
while(olLayers.getLength() > newLayers.length) {
olLayers.removeAt(newLayers.length);
}
this.selectionLayer=null;
if(this.mapEventHandlerInstalled && itemLayers.length==1 && this.getItemlayer(itemLayers[0]).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
this.selectionLayer = this.createSelectionLayer(this.getItemlayer(itemLayers[0]));
if(this.selectionLayer) olLayers.push(this.selectionLayer)
}
}
}
mapEventHandler = (event) => {
// select only when having observers
if(event.type === 'click' && !this.onFeatureSelected.observers.length) return;
if(event.type === 'pointermove' && !this.onFeatureHover.observers.length) return;
let itemLayer= this.getItemlayer(this.itemLayer);
if(itemLayer && itemLayer.layer) {
this.selectedFeatures = {};
if(itemLayer.layer ) {
let minZoom = itemLayer.layer.getMinZoom();
let currentZoom = this.map.instance.getView().getZoom();
if(currentZoom>minZoom) {
itemLayer.layer.getFeatures(event.pixel).then((features) => {
if(!features.length) {
this.onFeatureHover.emit(null);
return;
}
let fid = features[0].getId();
let feature = features[0];
if(event.type === 'pointermove') {
this.selectedFeatures[fid] = features[0];
this.onFeatureHover.emit({ "feature": feature,"itemCode":itemLayer.item.code });
} else {
this.onFeatureSelected.emit({ "feature": feature,"itemCode":itemLayer.item.code });
}
})
if(this.selectionLayer) this.selectionLayer.changed();
}
}
}
}
getItemlayer(itemLayer:IItemLayer):IItemLayer {
if((itemLayer as ITemporalItemLayer).selectedItemLayer) return (itemLayer as ITemporalItemLayer).selectedItemLayer;
return itemLayer;
}
ngOnChanges(changes: SimpleChanges) {
if (this.instance && this.initialized) {
if (changes['itemLayers']) {
var itemLayers = changes['itemLayers'].currentValue as IItemLayer[];
this.updateLayers(itemLayers);
}
if (changes['itemLayer']) {
var itemLayer = changes['itemLayer'].currentValue as IItemLayer;
this.itemLayer = itemLayer
if(itemLayer) {
if(this.getItemlayer(this.itemLayer).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
this.installMapEventHandler();
}
this.updateLayers([itemLayer]);
} else {
this.unInstallMapEventHandler();
this.updateLayers([]);
}
}
}
}
ngOnDestroy() {
this.unInstallMapEventHandler();
super.ngOnDestroy();
}
}

View File

@ -0,0 +1,189 @@
import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken } from '@angular/core';
import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ngx-openlayers';
import { ItemService,ItemTypeService,IItem, IItemType } from '@farmmaps/common';
import { Feature } from 'ol';
import { Point } from 'ol/geom';
import { MapBrowserEvent } from 'ol';
import * as style from 'ol/style';
import * as color from 'ol/color';
import * as loadingstrategy from 'ol/loadingstrategy';
import * as condition from 'ol/events/condition';
import * as extent from 'ol/extent';
import {Vector,Cluster} from 'ol/source';
import {Layer} from 'ol/layer';
import {GeoJSON} from 'ol/format';
import {Select} from 'ol/interaction';
import {IStyles} from '../../../models/style.cache';
import {FeatureIconService} from '../../../services/feature-icon.service';
@Component({
selector: 'fm-map-item-source-vector',
template: `<ng-content></ng-content>`,
providers: [
{ provide: SourceVectorComponent , useExisting: forwardRef(() => ItemVectorSourceComponent) }
]
})
export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnChanges {
instance: Vector;
private _format: GeoJSON;
private _select: Select;
private _hoverSelect: Select;
private _iconScale: number = 0.05;
@Input() features: Array<Feature>;
@Input() selectedFeature: Feature;
@Input() selectedItem: IItem;
@Input() styles:IStyles;
@Output() onFeatureSelected: EventEmitter<Feature> = new EventEmitter<Feature>();
@Output() onFeatureHover: EventEmitter<Feature> = new EventEmitter<Feature>();
private stylesCache:IStyles = {};
constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, private map: MapComponent, private itemTypeService: ItemTypeService,private featureIconService$:FeatureIconService) {
super(layer);
this._format = new GeoJSON();
}
geometry(feature: Feature) {
let view = this.map.instance.getView();
let resolution = view.getResolution();
var geometry = feature.getGeometry();
let e = geometry.getExtent();
//var size = Math.max((e[2] - e[0]) / resolution, (e[3] - e[1]) / resolution);
if (resolution > 12) {
geometry = new Point(extent.getCenter(e));
}
return geometry;
}
getSelectedStyle(feature:Feature):style.Style {
let key = feature.get('itemType')+"_selected";
let evaluatedStyle =null;
var styleEntry = this.stylesCache[key];
if(styleEntry) {
if(typeof styleEntry === 'function') {
evaluatedStyle = styleEntry(feature);
} else {
evaluatedStyle = styleEntry;
}
} else {
evaluatedStyle = this.stylesCache["selected"];
}
if(evaluatedStyle ) {
evaluatedStyle.setGeometry((feature) => this.geometry(feature));
}
return evaluatedStyle
}
ngOnInit() {
this.strategy = loadingstrategy.bbox;
this.format = new GeoJSON();
this._select = new Select({
style:null,
hitTolerance: 10,
layers: [this.layer.instance as Layer]
});
this._hoverSelect = new Select({
style: (feature) => {
return this.getSelectedStyle(feature);
},
hitTolerance: 10,
condition: (e: MapBrowserEvent) => {
return e.type == 'pointermove';
},
layers: [this.layer.instance as Layer]
});
this.map.instance.addInteraction(this._select);
this.map.instance.addInteraction(this._hoverSelect);
this._select.on('select', (e) => {
if (e.selected.length > 0 && e.selected[0]) {
this.onFeatureSelected.emit(e.selected[0]);
} else {
this.onFeatureSelected.emit(null);
}
});
this._hoverSelect.on('select', (e) => {
if (e.selected.length > 0 && e.selected[0]) {
this.onFeatureHover.emit(e.selected[0]);
} else {
this.onFeatureHover.emit(null);
}
});
this.instance = new Vector(this);
this.host.instance.setSource(this.instance);
this.host.instance.setStyle((feature) => {
var key = feature.get('itemType') + (this.selectedItem?"_I":"");
if (!this.stylesCache[key]) {
if (this.itemTypeService.itemTypes[key]) {
let itemType = this.itemTypeService.itemTypes[key];
let fillColor = color.asArray(itemType.iconColor);
fillColor[3] = 0;
this.stylesCache[key] = new style.Style({
image: itemType.icon ? new style.Icon({
anchor: [0.5, 1],
scale: 0.05,
src: this.featureIconService$.getIconImageDataUrl(itemType.icon)
}):null,
stroke: new style.Stroke({
color: 'red',
width: 1
}),
fill: new style.Fill({
color: fillColor
}),
geometry:(feature) => this.geometry(feature)
});
} else {
key = 'file';
}
}
let evaluatedStyle =null;
var styleEntry = this.stylesCache[key];
if(typeof styleEntry === 'function') {
evaluatedStyle = styleEntry(feature);
} else {
evaluatedStyle = styleEntry;
}
if(evaluatedStyle && evaluatedStyle.geometry_ == null) {
evaluatedStyle.setGeometry((feature) => this.geometry(feature));
}
return evaluatedStyle;
});
}
ngOnChanges(changes: SimpleChanges) {
if (changes["features"] && this.instance) {
this.instance.clear(true);
this._select.getFeatures().clear();
this.instance.addFeatures(changes["features"].currentValue);
}
if (changes["selectedFeature"] && this.instance) {
var features = this._hoverSelect.getFeatures();
var feature = changes["selectedFeature"].currentValue
//this.instance.clear(false);
//this.instance.addFeatures(features.getArray());
features.clear();
if (feature) {
//this.instance.removeFeature(feature);
features.push(feature)
}
}
if (changes["selectedItem"] && this.instance) {
var item = changes["selectedItem"].currentValue
if (item) {
this.map.instance.removeInteraction(this._hoverSelect);
} else {
this.map.instance.addInteraction(this._hoverSelect);
}
}
if (changes["styles"] && this.instance) {
let styles = changes["styles"].currentValue;
for (const key in styles) {
if (styles.hasOwnProperty(key)) {
this.stylesCache[key]=styles[key];
}
}
}
}
}

View File

@ -0,0 +1,31 @@
<div>
<div class="layerlist" *ngIf="itemLayers.length > 0;else noLayers">
<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}">
<div (click)="handleSelectLayer($event,itemLayer)" [title]="itemLayer.item.name">{{itemLayer.item.name}}</div>
<div class="mt-1" *ngIf="selectedLayer==itemLayer && !baseLayers">
<span class="btn-group">
<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 25%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.25)">25%</a>
<a title="Transparency 50%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.5)">50%</a>
<a title="Transparency 75%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.75)">75%</a>
<a title="No transparency" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,1)">100%</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>
<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>
<span class="float-right"><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>
<div *ngIf="itemLayer.legendVisible">
<div class="card legend">
<fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);"></fm-map-layer-legend>
</div>
</div>
</div>
</div>
</div>
</div>
<ng-template #noLayers>
<div class="list-group">
<div class="list-group-item" i18n>No layers</div>
</div>
</ng-template>

View File

@ -0,0 +1,18 @@
.layerlist ul {
list-style:none;
padding:0;
}
.active span.btn.btn-lnk.p-0.border-0 {
color:white;
}
.btn-sm {
padding:0.25rem 0.3rem;
}
.legend {
margin-top:0.5rem;
color:black;
padding:0.25rem;
}

View File

@ -0,0 +1,64 @@
import { Component,Input,Output,EventEmitter } from '@angular/core';
import { IItemLayer } from '../../../models/item.layer';
@Component({
selector: 'fm-map-layer-list',
templateUrl: './layer-list.component.html',
styleUrls: ['./layer-list.component.scss']
})
export class LayerListComponent {
@Input() itemLayers: IItemLayer[] = [];
@Input() baseLayers: boolean = false;
@Output() onToggleVisibility = new EventEmitter<IItemLayer>();
@Output() onSetOpacity = new EventEmitter<{layer: IItemLayer,opacity:number }>();
@Output() onDelete = new EventEmitter<IItemLayer>();
@Output() onZoomToExtent = new EventEmitter<IItemLayer>();
@Output() onSelectLayer = new EventEmitter<IItemLayer>();
@Input() selectedLayer: IItemLayer;
constructor( ) {
}
handleDelete(event:MouseEvent, item:IItemLayer) {
this.onDelete.emit(item);
event.preventDefault();
}
handleToggleVisibility(event:MouseEvent, item: IItemLayer) {
this.onToggleVisibility.emit(item);
item.legendVisible = item.visible && item.legendVisible;
event.preventDefault();
}
handleSetOpacity(event: MouseEvent, layer: IItemLayer,opacity:number) {
this.onSetOpacity.emit({ layer,opacity });
event.preventDefault();
}
handleZoomToExtent(event: MouseEvent, item: IItemLayer) {
this.onZoomToExtent.emit(item);
event.preventDefault();
}
handleSelectLayer(event: MouseEvent, item: IItemLayer) {
this.onSelectLayer.emit(item);
event.preventDefault();
}
firstLayer(item: IItemLayer): any {
if (item && item.item && item.item.data && item.item.data.layers && item.item.data.layers.length > 0) return item.item.data.layers[0];
return null;
}
toggleLegend(event: MouseEvent, lg: boolean) {
event.preventDefault();
return !lg;
}
handleLegendClick(event: MouseEvent, item: IItemLayer) {
this.onSelectLayer.emit(item);
this.onZoomToExtent.emit(item);
event.preventDefault();
}
}

View File

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

View File

@ -0,0 +1,37 @@
.layer-values {
position: absolute;
left: 50%;
top: 30%;
}
.cross {
display: block;
position: relative;
width: 1em;
height: 1em;
left: -0.5em;
top: -0.5em;
}
.values-container {
position: relative;
background-color: white;
left: calc( 1em - 1px);
top: -1.3em;
min-width: 15em;
}
.value-list {
list-style: none;
}
.pointer {
position: relative;
width: 0px;
height: 0px;
left: 0.5em;
border-top: 0.5em solid transparent;
border-bottom: 0.5em solid transparent;
border-right: 0.5em solid black;
}

View File

@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { LayerValuesComponent } from './layer-values.component';
describe('LayerValuesComponent', () => {
let component: LayerValuesComponent;
let fixture: ComponentFixture<LayerValuesComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ LayerValuesComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(LayerValuesComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,62 @@
import { Component, OnInit,Input,ViewChild,ElementRef,AfterViewInit } from '@angular/core';
import {IItemLayer} from '../../../models/item.layer';
import { Store } from '@ngrx/store';
import * as mapReducers from '../../../reducers/map.reducer';
import * as mapActions from '../../../actions/map.actions';
import { MapComponent } from 'ngx-openlayers';
import { ILayervalue } from '../../../models/layer.value';
import { Observable,interval,Subject } from 'rxjs';
import { debounce, throttle } from 'rxjs/operators';
import { toLonLat } from 'ol/proj';
import { toStringHDMS } from 'ol/coordinate';
import { ClipboardService } from 'ngx-clipboard'
import {GeoJSON,WKT} from 'ol/format';
import { Point } from 'ol/geom';
@Component({
selector: 'fm-map-layer-values',
templateUrl: './layer-values.component.html',
styleUrls: ['./layer-values.component.scss']
})
export class LayerValuesComponent implements OnInit,AfterViewInit {
@ViewChild('layerValues') containerRef:ElementRef;
offsetX$:number =0;
offsetY$:number =0;
lonlat$: string="";
wkt$= "";
layerValues$:Observable<Array<ILayervalue>> = this.store.select(mapReducers.selectGetLayerValues);
enabled$:Observable<boolean> = this.store.select(mapReducers.selectGetLayerValuesEnabled);
wktFormat$:WKT;
constructor( private store: Store<mapReducers.State>,private map: MapComponent,private clipboardService$:ClipboardService) {
this.wktFormat$=new WKT();
}
ngOnInit(): void {
}
moveEndSubject = new Subject<any>();
ngAfterViewInit():void {
this.offsetY$ = this.containerRef.nativeElement.offsetTop;
this.offsetX$ = this.containerRef.nativeElement.offsetLeft;
this.map.instance.on('moveend', () => {
this.moveEndSubject.next({});
});
this.moveEndSubject.pipe(throttle(ev => interval(100))).subscribe(() => this.updateValuesLocation());
}
updateValuesLocation() {
var xy = this.map.instance.getCoordinateFromPixel([this.offsetX$,this.offsetY$])
var lonlat = toLonLat(xy);
this.wkt$ = this.wktFormat$.writeGeometry(new Point(lonlat))
this.lonlat$ = toStringHDMS(lonlat);
this.store.dispatch(new mapActions.SetLayerValuesLocation(xy[0],xy[1]));
}
copyToClipboard() {
this.clipboardService$.copy(this.wkt$);
}
}

View File

@ -0,0 +1,31 @@
import { Component, OnDestroy, OnInit, Input, Optional, OnChanges, SimpleChanges } from '@angular/core';
import { Vector } from 'ol/layer';
import { Style } from 'ol/style';
import { StyleFunction } from 'ol/style/Style';
import { LayerVectorComponent, LayerGroupComponent, MapComponent } from 'ngx-openlayers';
import { RenderType } from 'ol/layer/Vector';
@Component({
selector: 'fm-map-aol-layer-vector-image',
template: `
<ng-content></ng-content>
`,
})
export class LayerVectorImageComponent extends LayerVectorComponent implements OnInit, OnDestroy, OnChanges {
public source: Vector;
@Input()
renderMode: RenderType | string = "image";
constructor(map: MapComponent) {
super(map);
}
ngOnInit() {
super.ngOnInit();
}
ngOnChanges(changes: SimpleChanges) {
super.ngOnChanges(changes);
}
}

View File

@ -0,0 +1,13 @@
<div (click)="handleClick($event)" class="btn btn-outline-primary gps-location">
<svg height="100%" width="100%" viewBox="0 0 96 96">
<g
id="XMLID_1_"><circle
class="pan-to" [ngClass]="{'pan-to-centered':centered(),'pan-to-disabled':disabled()}"
cx="48"
cy="48"
r="9.8000002"/><path
class="pan-to" [ngClass]="{'pan-to-centered':centered(),'pan-to-disabled':disabled()}"
d="M 80.5,44.8 H 73.8 C 72.3,33 63,23.7 51.3,22.2 v -6.7 h -6.5 v 6.7 C 33,23.7 23.7,33 22.2,44.8 h -6.7 v 6.5 h 6.7 C 23.7,63 33,72.3 44.8,73.8 v 6.7 h 6.5 V 73.8 C 63,72.3 72.3,63 73.8,51.3 h 6.7 z M 48,67.5 C 37.2,67.5 28.5,58.8 28.5,48 28.5,37.2 37.2,28.5 48,28.5 c 10.8,0 19.5,8.7 19.5,19.5 0,10.8 -8.7,19.5 -19.5,19.5 z"
inkscape:connector-curvature="0"/></g>
</svg>
</div>

View File

@ -0,0 +1,37 @@
@import "~bootstrap/scss/bootstrap.scss";
.gps-location {
display:block;
width:2.5em;
height:2.5em;
background-color: $body-bg;
background-size: contain;
margin-top:0.5em;
border-radius: 1.75em;
padding:0
}
.center, .tolerance, .border {
stroke-width: 0;
}
.pan-to {
fill: $secondary;
}
div.gps-location:hover .pan-to {
fill: $white;
}
.pan-to-centered {
fill: $primary;
}
div.gps-location:hover .pan-to-centered {
fill: theme-color-level($color-name: "primary", $level: -10)
}
.pan-to.pan-to-disabled {
fill: $gray-300;
}

View File

@ -0,0 +1,84 @@
import { Component, OnInit, Input, Host, OnChanges, SimpleChanges,ChangeDetectorRef } from '@angular/core';
import { MapComponent } from 'ngx-openlayers';
import {IMapState} from '../../../models/map.state'
import {View} from 'ol';
import { fromLonLat } from 'ol/proj';
@Component({
selector: 'fm-map-pan-to-location',
templateUrl: './pan-to-location.component.html',
styleUrls: ['./pan-to-location.component.scss']
})
export class PanToLocation implements OnInit,OnChanges{
view: View;
map: MapComponent;
@Input() position: Position;
@Input() mapState: IMapState;
@Input() animate: boolean;
constructor(@Host() map: MapComponent,private changeDetectorRef$: ChangeDetectorRef ) {
this.map = map;
}
ngOnInit() {
this.view = this.map.instance.getView();
this.view.on('change:center', () => {
this.changeDetectorRef$.detectChanges();
});
}
ngOnChanges(changes: SimpleChanges) {
// if (changes.position && this.instance) {
// var p = changes.position.currentValue as Position;
// this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
// this.locationTolerance = p.coords.accuracy;
// this.recalcLocationTolerance();
// this.heading = p.coords.heading;
// }
}
p
public centered():boolean {
if(this.position && this.mapState) {
let center = this.view.getCenter();
let newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]);
let x1 = newCenter[0].toFixed(0);
let x2 = center[0].toFixed(0);
let y1 = newCenter[1].toFixed(0);
let y2 = center[1].toFixed(0);
return x1==x2 && y1==y2;
}
return false;
}
public disabled():boolean {
return !this.position;
}
handleClick(event:Event) {
if(this.position) {
let view = this.map.instance.getView();
let newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]);
let extent = [newCenter[0]-500,newCenter[1]-500,newCenter[0]+500,newCenter[1]+500];
var options = { padding: [0, 0, 0, 0],minResolution:1 };
let size = this.map.instance.getSize();
let rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
let threshold = 44 * rem;
var left = 1 * rem;
var right = 1 * rem;
var bottom = Math.round(size[1] / 2);
var top = 1 * rem;
if (size[0] > threshold) {
bottom = 1 * rem;
left = 23 * rem;
}
//options.padding = [top, right, bottom, left];
if (this.animate) options["duration"] = 2000;
view.fit(extent, options);
}
event.preventDefault();
}
}

View File

@ -0,0 +1,35 @@
<div (click)="handleClick($event)" class="btn btn-outline-primary compass" [style.transform]="Rotation()" [ngClass]="{'compass-n':IsNorth()}">
<svg height="100%" width="100%" viewBox="0 0 132.29166 132.29167">
<g
inkscape:label="Laag 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-164.70832)">
<g
id="g4550"
transform="translate(2.3213753,-1.8555167)">
<path
id="top-r"
d="m 63.824458,179.82737 v 52.8823 H 48.380953 Z"
style="stroke:none;stroke-width:0.15389842px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
id="top-l"
d="m 63.824458,179.82737 v 52.8823 h 15.443505 z"
style="stroke:none;stroke-width:0.15389842px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
id="bottom-l"
d="m 63.824458,285.59197 v -52.8823 h -15.4435 z"
style="stroke:none;stroke-width:0.15389842px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
id="bottom-r"
d="m 63.824458,285.59197 v -52.8823 h 15.443505 z"
style="stroke:none;stroke-width:0.15389842px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
id="north"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:2.95481014"
d="m 50.702335,239.32724 h 9.926315 l 12.534859,23.63848 v -23.63848 h 8.425825 v 34.46509 H 71.663019 L 59.12816,250.15385 v 23.63848 h -8.425825 z" />
</g>
</g>
</svg>
</div>

View File

@ -0,0 +1,68 @@
@import "~bootstrap/scss/bootstrap.scss";
.compass {
width:2.5em;
height:2.5em;
background-color: white;
opacity: 1;
border-radius:1.75em;
padding:0;
margin-top:0.5em;
display: block;
}
#north {
display: none;
fill:$black;
}
#top-l {
fill:#d40000;
}
#top-r {
fill:#ff0000;
}
#bottom-l {
fill:#000000;
}
#bottom-r {
fill:#666666;
}
div.compass:hover #top-l {
fill:$white;
}
div.compass:hover #top-r {
fill:$gray-300;
}
div.compass:hover #bottom-l {
fill:$gray-300;
}
div.compass:hover #bottom-r {
fill:$white;
}
div.compass:hover #north {
fill:$white;
}
.compass-n {
transition: opacity 1s ease-out 2s,height 1s ease-out 3s,margin-top 1s ease-out 3s;
opacity:0;
height:0;
margin-top:0;
}
.compass-n #bottom-l, .compass-n #bottom-r {
display: none;
}
.compass-n #north {
display: inline;
}

View File

@ -0,0 +1,39 @@
import { Component, Host, Input, OnInit, ChangeDetectorRef } from '@angular/core';
import { ViewComponent, MapComponent } from 'ngx-openlayers';
import {View} from 'ol';
@Component({
selector: 'fm-map-rotation-reset',
templateUrl: './rotation-reset.component.html',
styleUrls: ['./rotation-reset.component.scss']
})
export class RotationResetComponent implements OnInit {
view: View;
public Rotation() {
let rotation = this.view ? this.view.getRotation() : 0;
return `rotate(${rotation}rad)`;
}
public IsNorth() {
return this.view ? this.view.getRotation() == 0 : true;
}
ngOnInit(): void {
this.view = this.map.instance.getView();
this.view.on('change:rotation', () => {
this.changeDetectorRef$.detectChanges();
});
}
constructor( private map: MapComponent, private changeDetectorRef$: ChangeDetectorRef ) {
}
handleClick(event:Event) {
this.view.animate({ rotation: 0 });
event.preventDefault();
}
}

View File

@ -0,0 +1,39 @@
import { Component, Host, Input, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
import { ViewComponent, MapComponent } from 'ngx-openlayers';
@Component({
selector: 'fm-map-zoom-to-extent',
template: `<ng-content></ng-content>`
})
export class ZoomToExtentComponent implements OnChanges {
view: ViewComponent;
map: MapComponent;
@Input() extent: number[];
@Input() animate: boolean = false;
constructor(@Host() view: ViewComponent, @Host() map: MapComponent) {
this.view = view;
this.map = map;
}
ngOnChanges(changes: SimpleChanges) {
if (this.extent) {
var options = { padding: [0, 0, 0, 0],minResolution:1 };
let size = this.map.instance.getSize();
let rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
let threshold = 40 * rem;
var left = 1 * rem;
var right = 1 * rem;
var bottom = Math.round((size[1] / 2) + (4*rem));
var top = 1 * rem;
if (size[0] > threshold) {
bottom = 5 * rem;
left = 23 * rem;
}
options.padding = [top, right, bottom, left];
if (this.animate) options["duration"] = 1000;
this.view.instance.fit(this.extent, options);
}
}
}

View File

@ -0,0 +1,3 @@
<div class="feature-list-container">
<ng-template fm-map-widget-host></ng-template>
</div>

View File

@ -0,0 +1,18 @@
@import "~bootstrap/scss/bootstrap.scss";
.row {
border-bottom: 1px solid gray('500');
user-select: none;
}
.row.selected {
background-color: gray('100');
}
@media screen and (min-width: 44rem) {
.feature-list-container {
margin-top: 4rem;
}
}

View File

@ -0,0 +1,91 @@
import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject} from '@angular/core';
import { Feature } from 'ol';
import { FeatureListComponent,AbstractFeatureListComponent } from '../feature-list/feature-list.component';
import { WidgetHostDirective } from '../widget-host/widget-host.directive';
import {IQueryState,PackageService } from '@farmmaps/common';
import * as mapReducers from '../../reducers/map.reducer';
import * as mapActions from '../../actions/map.actions';
import { Store } from '@ngrx/store';
import { Observable } from 'rxjs';
@Component({
selector: 'fm-map-feature-list-container',
templateUrl: './feature-list-container.component.html',
styleUrls: ['./feature-list-container.component.scss']
})
export class FeatureListContainerComponent {
constructor(private store: Store<mapReducers.State>,private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListComponent) public featureLists: AbstractFeatureListComponent[],private packageService:PackageService ) {
this.featureLists = [...this.featureLists].reverse();
}
@Input() features: Array<Feature>
@Input() queryState: IQueryState;
@Input() selectedFeature: Feature;
@Input() clickedFeature:Observable<Feature>;
@ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective;
componentRef:any;
loadComponent(queryState:IQueryState) {
let componentFactory: ComponentFactory<AbstractFeatureListComponent> = this.componentFactoryResolver.resolveComponentFactory(FeatureListComponent); // default
let selected = -1;
let maxMatches =0;
let showItem = true;
for (let i = 0; i < this.featureLists.length; i++) {
let matches=0;
let criteria=0;
if (this.featureLists[i]['forItemType']) {
criteria++;
if( this.featureLists[i]['forItemType'].indexOf(queryState.itemType) >= 0) {
matches++;
}
}
if(this.featureLists[i]['forChild'] ) {
criteria++;
if(queryState.parentCode && queryState.parentCode != "") {
matches++;
}
}
if(criteria == matches && matches > maxMatches) {
selected=i;
maxMatches = matches;
}
}
if (selected >= 0) {
componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.featureLists[selected]['constructor'] as any);
if (this.featureLists[selected]['collapseSearch'] === true) {
this.store.dispatch(new mapActions.CollapseSearch());
}
}
const viewContainerRef = this.widgetHost.viewContainerRef;
viewContainerRef.clear();
if(showItem) {
this.componentRef = viewContainerRef.createComponent(componentFactory);
(<AbstractFeatureListComponent>this.componentRef.instance).features = null;
(<AbstractFeatureListComponent>this.componentRef.instance).queryState = queryState;
(<AbstractFeatureListComponent>this.componentRef.instance).selectedFeature = null;
}
}
ngOnInit() {
this.clickedFeature.subscribe((feature => {
(<AbstractFeatureListComponent>this.componentRef.instance).handleFeatureClick(feature);
}));
}
ngOnChanges(changes: SimpleChanges) {
if ((changes["queryState"] && changes["queryState"].currentValue)) {
this.loadComponent(changes["queryState"].currentValue);
}
if ((changes["features"] && changes["features"].currentValue)) {
(<AbstractFeatureListComponent>this.componentRef.instance).features = changes["features"].currentValue;
this.componentRef.changeDetectorRef.detectChanges();
}
if(changes["selectedFeature"]) {
(<AbstractFeatureListComponent>this.componentRef.instance).selectedFeature = changes["selectedFeature"].currentValue;
this.componentRef.changeDetectorRef.detectChanges();
}
}
}

View File

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

View File

@ -0,0 +1,22 @@
@import "~bootstrap/scss/bootstrap.scss";
fm-map-feature-list-feature-container {
width:100%;
pointer-events:none;
}
.row {
border-bottom: 1px solid gray('500');
user-select: none;
padding-left:1.5rem;
}
.row.selected {
background-color: gray('100');
}
.cropfields {
border-top: 1px solid gray('500');
margin-left: -1.25rem;
margin-right: -1.25rem;
}

View File

@ -0,0 +1,30 @@
import { Component, Injectable,AfterViewInit, OnInit,SimpleChanges, ChangeDetectorRef} from '@angular/core';
import { Location } from '@angular/common';
import { AbstractFeatureListComponent } from '../feature-list/feature-list.component';
import {ForItemType } from '../for-item/for-itemtype.decorator';
import {ForChild } from '../for-item/for-child.decorator';
import { Store } from '@ngrx/store';
import * as mapReducers from '../../reducers/map.reducer';
import { commonReducers, ItemTypeService, IItem,ItemService } from '@farmmaps/common';
import { Observable } from 'rxjs';
@ForChild()
@ForItemType("vnd.farmmaps.itemtype.cropfield")
@Injectable()
@Component({
selector: 'fm-map-feature-list-cropfield',
templateUrl: './feature-list-cropfield.component.html',
styleUrls: ['./feature-list-cropfield.component.scss']
})
export class FeatureListCropfieldComponent extends AbstractFeatureListComponent implements OnInit {
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, private itemService: ItemService) {
super(store, itemTypeService,location);
}
public schemeItem: Observable<IItem>
ngOnInit() {
this.schemeItem = this.itemService.getItem(this.queryState.parentCode);
}
}

View File

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

View File

@ -0,0 +1,22 @@
@import "~bootstrap/scss/bootstrap.scss";
fm-map-feature-list-feature-container {
width:100%;
pointer-events:none;
}
.row {
border-bottom: 1px solid gray('500');
user-select: none;
padding-left:1.5rem;
}
.row.selected {
background-color: gray('100');
}
.farms {
border-top: 1px solid gray('500');
margin-left: -1.25rem;
margin-right: -1.25rem;
}

View File

@ -0,0 +1,30 @@
import { Component, Injectable } from '@angular/core';
import { Location } from '@angular/common';
import { AbstractFeatureListComponent } from '../feature-list/feature-list.component';
import { ForItemType } from '../for-item/for-itemtype.decorator';
import { Store,Action } from '@ngrx/store';
import * as mapReducers from '../../reducers/map.reducer';
import { commonReducers, ItemTypeService } from '@farmmaps/common';
import * as mapActions from '../../actions/map.actions';
import { tassign } from 'tassign';
import { Router } from '@angular/router';
import { Feature } from 'ol';
@ForItemType("vnd.farmmaps.itemtype.croppingscheme")
@Injectable()
@Component({
selector: 'fm-map-feature-list-croppingscheme',
templateUrl: './feature-list-croppingscheme.component.html',
styleUrls: ['./feature-list-croppingscheme.component.scss']
})
export class FeatureListCroppingschemeComponent extends AbstractFeatureListComponent {
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, private router: Router) {
super(store, itemTypeService, location);
}
getAction(feature:Feature):Action {
var queryState = tassign(mapReducers.initialState.queryState, { parentCode: feature.get('code'), itemType: "vnd.farmmaps.itemtype.cropfield" });
return new mapActions.DoQuery(queryState);
}
}

View File

@ -0,0 +1,60 @@
import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
import { Feature } from 'ol';
import { AbstractFeatureListFeatureComponent,FeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
import { WidgetHostDirective } from '../widget-host/widget-host.directive';
@Component({
selector: 'fm-map-feature-list-feature-container',
template: `
<div>
<ng-template fm-map-widget-host></ng-template>
</div>
`
})
export class FeatureListFeatureContainerComponent {
constructor(private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListFeatureComponent) public featureLists: AbstractFeatureListFeatureComponent[] ) {
this.featureLists = [...this.featureLists].reverse();
}
@Input() feature: Feature;
@ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective;
loadComponent() {
var componentFactory: ComponentFactory<AbstractFeatureListFeatureComponent> = this.componentFactoryResolver.resolveComponentFactory(FeatureListFeatureComponent); // default
let selected = -1;
let maxMatches =0;
for (let i = 0; i < this.featureLists.length; i++) {
let matches=0;
let criteria=0;
if (this.featureLists[i]['forItemType']) {
criteria++;
if(this.featureLists[i]['forItemType'].indexOf(this.feature.get("itemType")) >= 0) {
matches++;
}
}
if(criteria == matches && matches > maxMatches) {
selected=i;
maxMatches = matches;
}
}
if (selected >= 0) {
componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.featureLists[selected]['constructor'] as any);
}
const viewContainerRef = this.widgetHost.viewContainerRef;
viewContainerRef.clear();
const componentRef = viewContainerRef.createComponent(componentFactory);
(<AbstractFeatureListFeatureComponent>componentRef.instance).feature = this.feature;
}
ngOnChanges(changes: SimpleChanges) {
if (changes["feature"] && changes["feature"].currentValue) {
this.loadComponent();
}
}
}

View File

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

View File

@ -0,0 +1,26 @@
@import "~bootstrap/scss/bootstrap.scss";
.card-title {
font-size: 1rem;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.card-text {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.col {
overflow: hidden;
}
.thumbnail {
width: 4em;
height: 4em;
}

View File

@ -0,0 +1,33 @@
import { Component, Injectable,ViewChild,AfterViewInit} from '@angular/core';
import { Feature } from 'ol';
import { Store } from '@ngrx/store';
import * as mapReducers from '../../reducers/map.reducer';
import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
import { AbstractFeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
import { ForItemType } from '../for-item/for-itemtype.decorator';
import {getArea} from 'ol/sphere';
@ForItemType("vnd.farmmaps.itemtype.cropfield")
@Injectable()
@Component({
selector: 'fm-map-feature-list-feature-cropfield',
templateUrl: './feature-list-feature-cropfield.component.html',
styleUrls: ['./feature-list-feature-cropfield.component.scss']
})
export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFeatureComponent {
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService,config:AppConfig) {
super(store, itemTypeService,config);
}
areaInHa(feature:Feature):number {
if(!feature) return 0;
// get area from faeture if 0 calculate from polygon
let a = feature.get('area');
if(a) return a;
return getArea(feature.getGeometry(),{projectio:"EPSG:3857"}) / 10000;
}
}

View File

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

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