Skip to content

Commit

Permalink
FORMS-1207 - New Map Component for CHEFS (#1437)
Browse files Browse the repository at this point in the history
* Initial Skeleton

* component creation reference

* SMK Skeleton Integration

* Added map component changes

* Init Leaflet Component

* Fixed marker bug, reduced options to point and circle, prelim work on submission data

* refactor map component

* refactoring intermediate step

* Typescript conversion

* fixed Unknown Component Render issue

* Fixes for js->ts conversion, fixes for webpack css import

* fix for multi map on one page

* map settings form work

* added limits on map pointer submission and popups showing lat lng

* settings fix

* Settings for radio button with draw options

* Points fix

* fixes for marker

* Map zoom fix

* mapsubmission settings

* set map zoom fix

* set map zoom fix2

* added debug and other drawoptions

* Revert back to fieldComponent

* Fixes for multi input limits

* fixes for pr

* Removed unused packages

* Fix to non-interactive default map in settings page

* Added Read Only functionality

* map service update

* Settings Updated

* Settings text updated

* initial custom center

* Added customizing default map center

* Readonly in view submission mode

* Updated for Map data Submission to be an Json

* reorganized map settings, set new default center

* Fixed default bug

* map broken in Map Settings Page fixed

* init, added marker png to component folder

* Added custom marker, placeholder marker image

* Added fixes for marker centering

* Removed comments, and logs

* Added fix for marker drag

* Merge error

* Merge from pop

* Merge from pop

* Revert "Merge error"

This reverts commit dac5c6d.

* Commit fixes

* Fixes for marker dragging

* Cleanup

* removed extra node installs, vue etc...

* marker edit fix

* updated Map Component Settings

* Vue fix recant

* zoom bug fix,disable zoom animation

* cleanup

* restructure the display tab

* updated Display tab Settings in Map component

* Added zoom animations only for read-only maps

* Added My Location button

* linting fixes

* updated for polygon change

* added reorganization to settings page

* Added multiple marker type options, default to add input map

* Added default interactivity

* Geocoder working for BC

* Adding form and location popups

* fixes for marker appearing at geocoder search, replaced with popup

* Update MapService.ts 

console removed

* Added fix for popup bug

* Removed console

* Changes to map settings form to enable line input

* Update constants.js for Map component include

Update for Map component include in form Designer

* Changed settings form to formio defaults

* Fixes for PR comments, added constant for map component height

---------

Co-authored-by: RyanBirtch-aot <[email protected]>
Co-authored-by: RyanBirtch-aot <[email protected]>
  • Loading branch information
3 people authored Nov 25, 2024
1 parent a86f055 commit 83d6ae6
Show file tree
Hide file tree
Showing 18 changed files with 986 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,5 @@ build
!app/frontend/.env
!local-infrastructure/.env
.history
realm-export.json
chefs_build
37 changes: 34 additions & 3 deletions app/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
"font-awesome": "^4.7.0",
"formiojs": "^4.14.13",
"keycloak-js": "^21.1.1",
"leaflet": "^1.9.4",
"leaflet-draw": "^1.0.4",
"leaflet-geosearch": "^4.0.0",
"lodash": "^4.17.21",
"mitt": "^3.0.0",
"moment": "^2.29.4",
Expand Down
1 change: 1 addition & 0 deletions app/frontend/src/utils/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ export const FormDesignerBuilderOptions = Object.freeze({
orgbook: true,
bcaddress: true,
simplebcaddress: true,
map: true,
},
},
});
210 changes: 202 additions & 8 deletions components/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 83d6ae6

Please sign in to comment.