Merge branch 'main' into feature/gfi-set-feature-information

Author: warm-coolguy

e2e/draw.spec.ts

@@ -40,3 +40,43 @@ test('clicks to the map produce a fetchable pin coordinate', async ({
   expect(drawing.features.length).toBe(1)
   expect(drawing.features[0].geometry.coordinates[0].length).toBe(7)
 })
+
+test('two features drawn at the same coordinate can be modified separately', async ({
+  page,
+}) => {
+  await openSnowbox(page)
+
+  const canvas = await page.locator('canvas')
+  const boundingBox = await canvas.boundingBox()
+  if (boundingBox === null) throw new Error('Canvas not found.')
+  const { width, height } = boundingBox
+  let { x, y } = boundingBox
+
+  x += width / 2
+  y += height / 2
+
+  await page.getByLabel('Draw tools').click()
+  await page.getByText('Draw and write').click()
+  await page.getByText('Point').click()
+
+  await page.mouse.click(x, y)
+  await page.mouse.click(x, y)
+
+  await page.getByText('Edit').click()
+
+  await page.mouse.move(x, y)
+  await page.mouse.down()
+  await page.mouse.move(x + 40, y + 40)
+  await page.mouse.up()
+
+  const drawing = JSON.parse(await page.locator(drawTargetId).innerText())
+
+  expect(drawing.type).toBe('FeatureCollection')
+  expect(drawing.features.length).toBe(2)
+  expect(drawing.features[0].geometry.coordinates[0]).not.toBe(
+    drawing.features[1].geometry.coordinates[0]
+  )
+  expect(drawing.features[0].geometry.coordinates[1]).not.toBe(
+    drawing.features[1].geometry.coordinates[1]
+  )
+})

packages/plugins/Draw/src/store/createInteractions/createModifyInteractions.ts

@@ -38,9 +38,14 @@ export default function (
       }
     }
   })
-  return [
-    new Modify({ source: drawSource }),
-    new Snap({ source: drawSource }),
-    select,
-  ]
+
+  const modify = new Modify({ source: drawSource })
+  modify.on('modifystart', (event) => {
+    // NOTE: This prevents the user from dragging multiple features. Beware, as dragSegments is an internal property, this might break on an update of OpenLayers
+    if (event.target.dragSegments_[0]) {
+      event.target.dragSegments_ = [event.target.dragSegments_[0]]
+    }
+  })
+
+  return [modify, new Snap({ source: drawSource }), select]
 }