From 3691d8b96c9ce6ea4cbfacec4afb6f2ff16fdda9 Mon Sep 17 00:00:00 2001
From: Dan Leech <dan.leech@defra.gov.uk>
Date: Wed, 1 Jul 2026 14:37:52 +0100
Subject: [PATCH] Initial snap indicators not showing fix

---
 plugins/beta/draw-ol/src/draw/drawInput.js | 20 +++++++++++++-------
 plugins/beta/draw-ol/src/edit/EditMode.js  |  8 ++++----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/plugins/beta/draw-ol/src/draw/drawInput.js b/plugins/beta/draw-ol/src/draw/drawInput.js
index 239f76a6..212a67e5 100644
--- a/plugins/beta/draw-ol/src/draw/drawInput.js
+++ b/plugins/beta/draw-ol/src/draw/drawInput.js
@@ -58,7 +58,7 @@ const wireInputEvents = ({
   updateRubberbanding, placeVertex
 }) => {
   const onCenterChange = () => {
-    if (getInterfaceType() !== 'pointer') {
+    if (getInterfaceType() !== 'mouse') {
       updateRubberbanding()
     }
   }
@@ -91,7 +91,7 @@ const wireInputEvents = ({
 
   const onPointerdown = (e) => {
     if (e.pointerType !== 'touch') {
-      setInterfaceType('pointer')
+      setInterfaceType('mouse')
       clearLastCoord()
     }
   }
@@ -101,7 +101,7 @@ const wireInputEvents = ({
   }
 
   const onPointerMove = () => {
-    if (getInterfaceType() === 'pointer') {
+    if (getInterfaceType() === 'mouse') {
       return
     }
     updateRubberbanding()
@@ -127,7 +127,7 @@ const wireInputEvents = ({
 
 export const createDrawInput = ({ drawInteraction, options }) => {
   const { container, addVertexButtonId, mapProvider, snap, onUndo, canFinish } = options
-  let interfaceType = options.interfaceType
+  let interfaceType = options.interfaceType ?? 'mouse'
   let sketchFeature = null
   let lastPlacedCoord = null
 
@@ -146,6 +146,12 @@ export const createDrawInput = ({ drawInteraction, options }) => {
 
   const updateRubberbanding = () => {
     if (!sketchFeature) {
+      // No sketch yet — update snap indicator at crosshair position so targets are
+      // visible before the first vertex is placed (touch/keyboard only; mouse uses
+      // the OL snap interaction's pointermove handler instead).
+      if (interfaceType !== 'mouse' && snap) {
+        snap.apply(mapProvider.getCenter())
+      }
       return
     }
     const geom = sketchFeature.getGeometry()
@@ -154,7 +160,7 @@ export const createDrawInput = ({ drawInteraction, options }) => {
       return
     }
     const raw = mapProvider.getCenter()
-    const centerCoord = (interfaceType !== 'pointer' && snap) ? snap.apply(raw) : raw
+    const centerCoord = (interfaceType !== 'mouse' && snap) ? snap.apply(raw) : raw
     applyRubberbanding(geom, centerCoord)
   }
 
@@ -192,7 +198,7 @@ export const createDrawInput = ({ drawInteraction, options }) => {
 
   const placeVertex = () => {
     const raw = mapProvider.getCenter()
-    const coord = (interfaceType !== 'pointer' && snap) ? snap.apply(raw) : raw
+    const coord = (interfaceType !== 'mouse' && snap) ? snap.apply(raw) : raw
     snap?.hideIndicator()
     if (sketchFeature) {
       const geom = sketchFeature.getGeometry()
@@ -221,7 +227,7 @@ export const createDrawInput = ({ drawInteraction, options }) => {
 
   // change:center fires once when a keyboard pan animation starts; postrender tracks each frame.
   const onMapRender = () => {
-    if (interfaceType !== 'pointer' && olView?.getAnimating()) {
+    if (interfaceType !== 'mouse' && olView?.getAnimating()) {
       updateRubberbanding()
     }
   }
diff --git a/plugins/beta/draw-ol/src/edit/EditMode.js b/plugins/beta/draw-ol/src/edit/EditMode.js
index 208acc80..f756770d 100644
--- a/plugins/beta/draw-ol/src/edit/EditMode.js
+++ b/plugins/beta/draw-ol/src/edit/EditMode.js
@@ -41,7 +41,7 @@ export const createEditMode = ({ map, manager, options }) => {
     selectedVertexType: null,
     vertices: [],
     midpoints: [],
-    interfaceType: interfaceType ?? 'pointer'
+    interfaceType: interfaceType ?? 'mouse'
   }
 
   const getState = () => state
@@ -210,7 +210,7 @@ export const createEditMode = ({ map, manager, options }) => {
       touchHandler.updateTargetPosition()
       return
     }
-    state.interfaceType = 'pointer'
+    state.interfaceType = 'mouse'
 
     const olPixel = map.getEventPixel(e)
     const pixel = { x: olPixel[0], y: olPixel[1] }
@@ -242,10 +242,10 @@ export const createEditMode = ({ map, manager, options }) => {
     if (e.pointerType !== 'mouse') {
       return
     }
-    if (state.interfaceType === 'pointer') {
+    if (state.interfaceType === 'mouse') {
       return
     }
-    state.interfaceType = 'pointer'
+    state.interfaceType = 'mouse'
     touchHandler.hide()
   }