Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple marker selection via BoundsDriftMarker and SemanticMarkers #588

Merged
merged 58 commits into from
Dec 2, 2023
Merged
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
36e3809
multi-selecting markers
moontrip Sep 20, 2023
8762a17
Merge branch 'main' into 431-multi-select-marker
moontrip Sep 20, 2023
107ff4e
map panning behavior, refactoring, etc
moontrip Sep 27, 2023
bc2072e
Merge branch 'main' and resolve conflicts
moontrip Sep 27, 2023
a6eff5b
geohash level-based, not zoom level-based
moontrip Oct 3, 2023
4598db1
Merge branch 'main' into 431-multi-select-marker
moontrip Oct 3, 2023
ba54206
remove unnecessary useState
moontrip Oct 3, 2023
de58292
testing multiple markers selection with SAM
moontrip Oct 4, 2023
3c1817a
Merge branch 'main' into 431-multi-select-marker
moontrip Oct 16, 2023
70d404d
Merge branch 'main' into multiple-marker-selection-test-with-SAM
moontrip Oct 16, 2023
b967b13
Merge branch '431-multi-select-marker' into multiple-marker-selection…
moontrip Oct 16, 2023
f2e906d
address feedbacks - bubble marker etc
moontrip Oct 17, 2023
e2a50e1
Merge branch '431-multi-select-marker' into multiple-marker-selection…
moontrip Oct 17, 2023
7dbb296
add bubble marker case
moontrip Oct 17, 2023
f039262
Merge branch 'main' into 431-multi-select-marker
moontrip Oct 17, 2023
c4dd96c
Merge branch '431-multi-select-marker' into multiple-marker-selection…
moontrip Oct 17, 2023
d935c70
commented out data for markerData prop
moontrip Oct 18, 2023
985ae32
Merge branch '431-multi-select-marker' into multiple-marker-selection…
moontrip Oct 18, 2023
3e235e5
Merge branch 'main' into 431-multi-select-marker
moontrip Oct 18, 2023
ab96bed
Merge branch '431-multi-select-marker' into multiple-marker-selection…
moontrip Oct 18, 2023
a8243c6
Merge branch 'main', resolve conflicts, implement marker selection
moontrip Nov 1, 2023
894b15c
Merge pull request #581 from VEuPathDB/multiple-marker-selection-bran…
moontrip Nov 1, 2023
a92d7ab
Merge branch 'main' into multiple-marker-selection-test-with-SAM
moontrip Nov 1, 2023
2c52bbd
stripped markerDataProps and pan/zoom logic which needs replacing
bobular Nov 2, 2023
2ed061f
move some logic to SemanticMarkers - still not working
bobular Nov 2, 2023
d9285fc
basic pan now working
bobular Nov 2, 2023
928572d
remove some props
bobular Nov 2, 2023
d0c04cf
more react-like highlighting
bobular Nov 2, 2023
27c2eb0
added effect to remove off-screen or wrong-zoom level selectedMarkers
bobular Nov 2, 2023
69d0db9
fix errors and enable multi-selection marker for SAM
moontrip Nov 3, 2023
4f3c0ee
Merge pull request #589 from VEuPathDB/fix-errors
moontrip Nov 3, 2023
5c5e106
address popup positions
moontrip Nov 8, 2023
ba81346
remove unnecessary comments
moontrip Nov 8, 2023
a0cb77c
Merge branch 'main' into multiple-marker-selection-test-with-SAM
bobular Nov 8, 2023
7c8d796
simple merge conflict resolution
bobular Nov 8, 2023
ecb5795
Merge remote-tracking branch 'origin/multiple-marker-selection-simpli…
bobular Nov 8, 2023
43792d2
address marker double-click
moontrip Nov 9, 2023
8585d03
Merge pull request #610 from VEuPathDB/address-popup-location-issue
moontrip Nov 9, 2023
b7fc15e
Merge branch 'multiple-marker-selection-simplified' into address-mark…
moontrip Nov 9, 2023
bccb490
Merge pull request #615 from VEuPathDB/address-marker-double-click
moontrip Nov 9, 2023
d5a8369
disable multiple markers for merge
bobular Nov 10, 2023
6d08167
Merge remote-tracking branch 'origin/main' into multiple-marker-selec…
bobular Nov 10, 2023
bab05f5
Merge branch 'main' into multiple-marker-selection-simplified
moontrip Nov 13, 2023
4ca816b
marker popup highlight
moontrip Nov 15, 2023
581f16f
Merge branch 'main' into map-marker-popup-highlight
moontrip Nov 15, 2023
c3d4764
Merge remote-tracking branch 'origin/main' into multiple-marker-selec…
bobular Nov 17, 2023
9a745bd
Merge remote-tracking branch 'origin/main' into map-marker-popup-high…
bobular Nov 17, 2023
be47073
Merge branch 'multiple-marker-selection-simplified' of https://github…
moontrip Nov 18, 2023
f6d730a
Merge branch 'multiple-marker-selection-simplified' of https://github…
moontrip Nov 18, 2023
059ebae
Merge branch 'map-marker-popup-highlight' of https://github.com/VEuPa…
moontrip Nov 18, 2023
2360aa6
fix instability due to empty array reference
bobular Nov 18, 2023
ae06ea1
Merge branch 'multiple-marker-selection-simplified' into map-marker-p…
bobular Nov 18, 2023
87c1283
Merge pull request #644 from VEuPathDB/map-marker-popup-highlight
moontrip Nov 18, 2023
1cc3c06
Merge branch 'main' into multiple-marker-selection-simplified
moontrip Nov 28, 2023
54984a0
a solution to prevent single click while double clicking
moontrip Nov 29, 2023
8a219f6
simplify and cleanup
moontrip Nov 29, 2023
64596db
Merge pull request #683 from VEuPathDB/prevent-single-click-when-doub…
moontrip Nov 29, 2023
e23b37e
resolved minor conflicts
bobular Dec 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into 431-multi-select-marker
  • Loading branch information
moontrip committed Oct 3, 2023
commit 4598db14fe3ab9815997c6aee42096b7ac71c029

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.