Skip to content

Give collaborative layer markers their own map pane - #392

Merged
OSPFNeighbour merged 1 commit into
master-devfrom
collab-marker-pane-order
Aug 4, 2026
Merged

Give collaborative layer markers their own map pane#392
OSPFNeighbour merged 1 commit into
master-devfrom
collab-marker-pane-order

Conversation

@OSPFNeighbour

Copy link
Copy Markdown
Collaborator

Summary

  • Collaborative layer markers previously rendered in Leaflet's default markerPane (fixed z-index 600) instead of one of the app's custom panes, so they weren't part of the "Marker Layer Order" drawer and could stack unpredictably relative to Incident/Asset markers.
  • Adds a new pane-collab pane, defaulted between Incident markers (above) and Asset markers (below), and wires collab markers to use it.
  • Fixes the "append missing pane" migration logic so a pane newly introduced to paneDefs (like this one) is inserted at its default relative position in existing users' saved layer-order configs, rather than always landing at the bottom.
  • Minor UI polish in the Config modal (clarified "Incident Marker Clustering" / "Marker Layer Order" labels, added helper text).

Test plan

  • Load the tasking map, open Config → Marker Layer Order, confirm "Collaborative layer markers" appears between "Incident markers" and "Asset markers" by default.
  • Verify a collaborative layer marker renders above asset markers and below incident markers on the map.
  • Drag-reorder panes, confirm collab markers move with their assigned pane.
  • For an account with a previously-saved pane order (missing pane-collab), confirm it gets inserted in the correct default slot rather than at the bottom.

🤖 Generated with Claude Code

Collab markers previously fell into Leaflet's default markerPane
(fixed z-index 600), so they weren't part of the layer-order drawer
and could render inconsistently relative to Incident/Asset markers
depending on the user's pane order config.

Adds a pane-collab pane, defaulted to sit under Incident markers but
above Asset markers, and makes it a first-class entry in the
draggable layer order list. Existing saved pane orders get the new
pane inserted at its default relative position instead of always
appended at the bottom.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@OSPFNeighbour
OSPFNeighbour changed the base branch from master to master-dev August 4, 2026 12:49
@OSPFNeighbour
OSPFNeighbour merged commit 53799c4 into master-dev Aug 4, 2026
1 check passed
@OSPFNeighbour
OSPFNeighbour deleted the collab-marker-pane-order branch August 4, 2026 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant