project-nomad

Commit Graph

Author	SHA1	Message	Date
Chris Sherwood	54cd133231	Merge PR #802 (kennethbrewer3) - feat(maps): add details on marker Resolved 2 conflicts arising from #786 + #802 both restructuring map UX. ScaleUnitToggle.tsx: - Combined #786's onMouseEnter prop (essential for hide-coords-over-controls) with #802's cursor-pointer styling and `if (scaleUnit !== X)` guards. - Kept Tailwind classes (codebase convention) over #802's inline styles. MapComponent.tsx: - Layered #786's cursor/coords/dragging UX on top of #802's componentized marker structure (MapMarkerFormPopup, ViewMapMarkerPopup). - Dropped #786's inline marker form (markerName/markerColor state + handleSaveMarker) — superseded by #802's MapMarkerFormPopup which manages its own form state. - Used #802's handleMapClick (calls confirmDiscardMarkerChanges) instead of #786's simple version. - Added '.maplibregl-popup' to both control selectors so #786's hide-coords-over-controls UX naturally extends to popups without requiring changes to #802's popup components. - Kept all of #786's drag/cursor handlers on <Map> (onMouseDown/Up/ DragStart/End/MouseMove/MouseLeave + cursor='grabbing'/'crosshair'). - Kept #802's editingMarkerId / hasUnsavedMarkerChanges state for the edit flow.	2026-04-30 14:48:13 -07:00
Kenneth Brewer	a09d945b41	changed the color sort to use hue so that when custom colors are introduced it will sort in a way that is logically consistent.	2026-04-28 10:03:38 -04:00
Kenneth Brewer	1d7c40c37b	Moved the scale unit control to its own component file for easier maintenance. Enhanced the behavior of the coordinate display on the map to not display when over the on screen controls, and the navigation bar. Added a toggle to turn off the coordinate display if the user doesn't wish to see it. Intentionally left the coordinate display when over a map marker so that the coordinates of the map marker can be estimated. In the future I intend to add the coordinates of a map marker when the map marker is clicked so that behavior may change in the future.	2026-04-25 04:18:49 -04:00

Author

SHA1

Message

Date

Chris Sherwood

54cd133231

Merge PR #802 (kennethbrewer3) - feat(maps): add details on marker

Resolved 2 conflicts arising from #786 + #802 both restructuring map UX.

ScaleUnitToggle.tsx:
  - Combined #786's onMouseEnter prop (essential for hide-coords-over-controls)
    with #802's cursor-pointer styling and `if (scaleUnit !== X)` guards.
  - Kept Tailwind classes (codebase convention) over #802's inline styles.

MapComponent.tsx:
  - Layered #786's cursor/coords/dragging UX on top of #802's componentized
    marker structure (MapMarkerFormPopup, ViewMapMarkerPopup).
  - Dropped #786's inline marker form (markerName/markerColor state +
    handleSaveMarker) — superseded by #802's MapMarkerFormPopup which
    manages its own form state.
  - Used #802's handleMapClick (calls confirmDiscardMarkerChanges) instead
    of #786's simple version.
  - Added '.maplibregl-popup' to both control selectors so #786's
    hide-coords-over-controls UX naturally extends to popups without
    requiring changes to #802's popup components.
  - Kept all of #786's drag/cursor handlers on <Map> (onMouseDown/Up/
    DragStart/End/MouseMove/MouseLeave + cursor='grabbing'/'crosshair').
  - Kept #802's editingMarkerId / hasUnsavedMarkerChanges state for the
    edit flow.

2026-04-30 14:48:13 -07:00

Kenneth Brewer

a09d945b41

changed the color sort to use hue so that when custom colors are introduced it will sort in a way that is logically consistent.

2026-04-28 10:03:38 -04:00

Kenneth Brewer

1d7c40c37b

Moved the scale unit control to its own component file for easier maintenance. Enhanced the behavior of the coordinate display on the map to not display when over the on screen controls, and the navigation bar. Added a toggle to turn off the coordinate display if the user doesn't wish to see it. Intentionally left the coordinate display when over a map marker so that the coordinates of the map marker can be estimated. In the future I intend to add the coordinates of a map marker when the map marker is clicked so that behavior may change in the future.

2026-04-25 04:18:49 -04:00

3 Commits