From 9e7043cadbdddff1a5b830f89f764f76d22377a8 Mon Sep 17 00:00:00 2001
From: matthewjmckinley <matthewjamesmckinley@gmail.com>
Date: Thu, 25 Jun 2026 15:56:36 -0700
Subject: [PATCH 1/3] Add sequence/step through mode to Geolocation
 ExhibitBuilder block

---
 .../exhibit_layouts/geolocation-map/form.php  | 18 ++++++++
 .../geolocation-map/layout.css                | 17 +++++++
 .../geolocation-map/layout.php                | 44 +++++++++++++++++++
 3 files changed, 79 insertions(+)

diff --git a/views/shared/exhibit_layouts/geolocation-map/form.php b/views/shared/exhibit_layouts/geolocation-map/form.php
index c62defb..9daab47 100644
--- a/views/shared/exhibit_layouts/geolocation-map/form.php
+++ b/views/shared/exhibit_layouts/geolocation-map/form.php
@@ -1,4 +1,22 @@
+<?php
+$formStem = $block->getFormStem();
+$options = $block->getOptions();
+?>
 <div class="selected-items">
     <h4><?php echo __('Items'); ?></h4>
     <?php echo $this->exhibitFormAttachments($block); ?>
 </div>
+
+<div class="layout-options">
+    <div class="block-header drawer">
+        <h4><?php echo __('Layout Options'); ?></h4>
+        <button class="drawer-toggle" type="button" data-action-selector="opened" aria-expanded="true" aria-controls="<?php echo $formStem; ?>-layout-options" aria-label="<?php echo __('Show options'); ?>" title="<?php echo __('Show options'); ?>"><span class="icon"></span></button>
+    </div>
+    <div class="drawer-contents" id="<?php echo $formStem; ?>-layout-options">
+        <div class="sequence-mode">
+            <?php echo $this->formLabel($formStem . '[options][sequence]', __('Sequence mode')); ?>
+            <?php echo $this->formCheckbox($formStem . '[options][sequence]', @$options['sequence'], [], ['1', '0']); ?>
+            <p class="instructions"><?php echo __('Step through locations in the arranged order above.'); ?></p>
+        </div>
+    </div>
+</div>
diff --git a/views/shared/exhibit_layouts/geolocation-map/layout.css b/views/shared/exhibit_layouts/geolocation-map/layout.css
index daf8e0d..6c3a249 100644
--- a/views/shared/exhibit_layouts/geolocation-map/layout.css
+++ b/views/shared/exhibit_layouts/geolocation-map/layout.css
@@ -2,3 +2,20 @@
     width: 100%;
     height: 450px;
 }
+
+.layout-geolocation-map .geolocation-sequence-nav {
+    display: flex;
+    align-items: center;
+    gap: 0.5em;
+    margin-bottom: 0.5em;
+}
+
+.layout-geolocation-map .geolocation-sequence-counter {
+    min-width: 4em;
+    text-align: center;
+}
+
+.layout-geolocation-map .geolocation-sequence-nav button:disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+}
diff --git a/views/shared/exhibit_layouts/geolocation-map/layout.php b/views/shared/exhibit_layouts/geolocation-map/layout.php
index 15be75f..f82a7bc 100644
--- a/views/shared/exhibit_layouts/geolocation-map/layout.php
+++ b/views/shared/exhibit_layouts/geolocation-map/layout.php
@@ -33,6 +33,7 @@
         ];
     endforeach;
 endforeach;
+$sequenceMode = !empty($options['sequence']) && count($locations) > 0;
 ?>
 <script type="text/javascript">
 jQuery(window).on('load', function () {
@@ -42,11 +43,54 @@
         <?php echo $this->geolocationMapOptions(); ?>);
     geolocation_map.initMap();
     var map_locations = <?php echo json_encode($locations); ?>;
+<?php if ($sequenceMode): ?>
+    var layers = [];
+    for (var i = 0; i < map_locations.length; i++) {
+        var locationData = map_locations[i];
+        layers.push(geolocation_map.addLayerFromGeometry(JSON.parse(locationData.geometry_json), {}, locationData.html));
+    }
+    var currentIndex = 0;
+    var total = layers.length;
+    var prevBtn = jQuery('#<?php echo $divId; ?>-prev');
+    var nextBtn = jQuery('#<?php echo $divId; ?>-next');
+    var counter = jQuery('#<?php echo $divId; ?>-counter');
+    function goToStep(index) {
+        currentIndex = index;
+        var layer = layers[currentIndex];
+        var geometry = JSON.parse(map_locations[currentIndex].geometry_json);
+        if (geometry.type === 'Point') {
+            geolocation_map.map.flyTo(layer.getLatLng());
+        } else {
+            geolocation_map.map.fitBounds(layer.getBounds(), {padding: [25, 25]});
+        }
+        geolocation_map.map.once('moveend', function () {
+            layer.openPopup();
+        });
+        counter.text((currentIndex + 1) + ' / ' + total);
+        prevBtn.prop('disabled', currentIndex === 0);
+        nextBtn.prop('disabled', currentIndex === total - 1);
+    }
+    prevBtn.on('click', function () {
+        if (currentIndex > 0) goToStep(currentIndex - 1);
+    });
+    nextBtn.on('click', function () {
+        if (currentIndex < total - 1) goToStep(currentIndex + 1);
+    });
+    goToStep(0);
+<?php else: ?>
     for (var i = 0; i < map_locations.length; i++) {
         var locationData = map_locations[i];
         geolocation_map.addLayerFromGeometry(JSON.parse(locationData.geometry_json), {}, locationData.html);
     }
     geolocation_map.fitLocations();
+<?php endif; ?>
 });
 </script>
+<?php if ($sequenceMode): ?>
+<div class="geolocation-sequence-nav" aria-label="<?php echo __('Location sequence navigation'); ?>">
+    <button id="<?php echo $divId; ?>-prev" class="geolocation-sequence-prev" type="button" disabled><?php echo __('Previous'); ?></button>
+    <span id="<?php echo $divId; ?>-counter" class="geolocation-sequence-counter">1 / <?php echo count($locations); ?></span>
+    <button id="<?php echo $divId; ?>-next" class="geolocation-sequence-next" type="button"<?php if (count($locations) === 1): ?> disabled<?php endif; ?>><?php echo __('Next'); ?></button>
+</div>
+<?php endif; ?>
 <div id="<?php echo $divId; ?>" class="geolocation-map exhibit-geolocation-map"></div>

From 1a5e3c3033a6a80e07564d6d77774ca5b1ee18de Mon Sep 17 00:00:00 2001
From: matthewjmckinley <matthewjamesmckinley@gmail.com>
Date: Wed, 1 Jul 2026 15:04:20 -0700
Subject: [PATCH 2/3] Fine tune sequencing movement order and behavior

---
 .../exhibit_layouts/geolocation-map/layout.php     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/views/shared/exhibit_layouts/geolocation-map/layout.php b/views/shared/exhibit_layouts/geolocation-map/layout.php
index f82a7bc..198fe63 100644
--- a/views/shared/exhibit_layouts/geolocation-map/layout.php
+++ b/views/shared/exhibit_layouts/geolocation-map/layout.php
@@ -54,18 +54,24 @@
     var prevBtn = jQuery('#<?php echo $divId; ?>-prev');
     var nextBtn = jQuery('#<?php echo $divId; ?>-next');
     var counter = jQuery('#<?php echo $divId; ?>-counter');
+    var pendingPopupOpen = null;
     function goToStep(index) {
         currentIndex = index;
         var layer = layers[currentIndex];
         var geometry = JSON.parse(map_locations[currentIndex].geometry_json);
+        if (pendingPopupOpen) {
+            geolocation_map.map.off('moveend', pendingPopupOpen);
+        }
+        pendingPopupOpen = function () {
+            pendingPopupOpen = null;
+            layer.openPopup();
+        };
+        geolocation_map.map.once('moveend', pendingPopupOpen);
         if (geometry.type === 'Point') {
             geolocation_map.map.flyTo(layer.getLatLng());
         } else {
-            geolocation_map.map.fitBounds(layer.getBounds(), {padding: [25, 25]});
+            geolocation_map.map.flyToBounds(layer.getBounds(), {padding: [25, 25]});
         }
-        geolocation_map.map.once('moveend', function () {
-            layer.openPopup();
-        });
         counter.text((currentIndex + 1) + ' / ' + total);
         prevBtn.prop('disabled', currentIndex === 0);
         nextBtn.prop('disabled', currentIndex === total - 1);

From 2246ab4cf6bb1ab6da5992b13f1db0af343ad019 Mon Sep 17 00:00:00 2001
From: matthewjmckinley <matthewjamesmckinley@gmail.com>
Date: Thu, 2 Jul 2026 11:22:28 -0700
Subject: [PATCH 3/3] Add multiple location item behavior to sequence mode
 helper text

---
 views/shared/exhibit_layouts/geolocation-map/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/shared/exhibit_layouts/geolocation-map/form.php b/views/shared/exhibit_layouts/geolocation-map/form.php
index 9daab47..aea3251 100644
--- a/views/shared/exhibit_layouts/geolocation-map/form.php
+++ b/views/shared/exhibit_layouts/geolocation-map/form.php
@@ -16,7 +16,7 @@
         <div class="sequence-mode">
             <?php echo $this->formLabel($formStem . '[options][sequence]', __('Sequence mode')); ?>
             <?php echo $this->formCheckbox($formStem . '[options][sequence]', @$options['sequence'], [], ['1', '0']); ?>
-            <p class="instructions"><?php echo __('Step through locations in the arranged order above.'); ?></p>
+            <p class="instructions"><?php echo __('Step through locations in the arranged order above. For items with multiple locations, the locations will advance in the order which they were added.'); ?></p>
         </div>
     </div>
 </div>