Added multiple marker type options, default to add input map

RyanBirtch-aot · Sep 26, 2024 · 03d20e4 · 03d20e4
1 parent 518b568
commit 03d20e4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/components/src/components/Map/Component.ts b/components/src/components/Map/Component.ts
@@ -55,6 +55,7 @@ export default class Component extends (FieldComponent as any) {
   loadMap() {
     const mapContainer = document.getElementById(`map-${this.componentID}`);
     const form = document.getElementsByClassName('formio');
+
     const drawOptions = {
       marker: false,
       circlemarker: false,
@@ -63,13 +64,18 @@ export default class Component extends (FieldComponent as any) {
       circle: false,
       rectangle: null,
     };
+    // set marker type from user choice
+    if (this.component.markerType) {
+      for (const [key, value] of Object.entries(this.component.markerType)) {
+        drawOptions[key] = value;
+      }
+    }
 
     // Set drawing options based on markerType
-    if (this.component.markerType === 'rectangle') {
+    if (this.component?.markerType?.rectangle) {
       drawOptions.rectangle = { showArea: false }; // fixes a bug in Leaflet.Draw
     } else {
       drawOptions.rectangle = false;
-      drawOptions[this.component.markerType] = true; // set marker type from user choice
     }
 
     const {

diff --git a/components/src/components/Map/editForm/Component.edit.data.ts b/components/src/components/Map/editForm/Component.edit.data.ts
@@ -44,7 +44,7 @@ export default {
       label: 'Default Center',
       numPoints: 1,
       tableView: false,
-      markerType: 'marker',
+      markerType: { marker: true },
       defaultZoom: 5,
       allowSubmissions: true,
       description:
@@ -81,7 +81,7 @@ export default {
       ],
       defaultValue: 'marker',
       key: 'markerType',
-      type: 'simpleradios',
+      type: 'simplecheckboxes',
       input: true,
     },
     {
@@ -92,12 +92,13 @@ export default {
       input: true,
     },
     {
-      label: 'Submitter "My Location" button',
+      label: 'Enable Submitter "My Location" button',
       description:
         'This allows for the user to center the map on their location.',
       key: 'myLocation',
-      type: 'simplecheckbox',
+      type: 'simplecheckboxadvanced',
       input: true,
+      defaultValue: true,
     },
   ],
 };