Improve selecting shapes/traces #5463
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,14 +56,15 @@ class SelectionMapFragment( | |
| @Inject | ||
| lateinit var permissionsChecker: PermissionsChecker | ||
|
|
||
| private val selectedItemViewModel by viewModels<SelectedItemViewModel>() | ||
|
|
||
| private lateinit var map: MapFragment | ||
| private lateinit var summarySheetBehavior: BottomSheetBehavior<*> | ||
| private lateinit var summarySheet: SelectionSummarySheet | ||
| private lateinit var bottomSheetCallback: BottomSheetCallback | ||
|
|
||
| private val itemsByFeatureId: MutableMap<Int, MappableSelectItem> = mutableMapOf() | ||
| private val featureIdsByItemId: MutableMap<Long, Int> = mutableMapOf() | ||
|
|
||
| /** | ||
| * Points to be mapped. Note: kept separately from [.itemsByFeatureId] so we can | ||
|
|
@@ -234,10 +235,10 @@ class SelectionMapFragment( | |
|
|
||
| bottomSheetCallback = object : BottomSheetCallback() { | ||
| override fun onStateChanged(onStateChangedbottomSheet: View, newState: Int) { | ||
| val selectedItem = selectedItemViewModel.getSelectedItem() | ||
| if (newState == STATE_HIDDEN && selectedItem != null) { | ||
| selectedItemViewModel.setSelectedItem(null) | ||
| resetIcon(selectedItem) | ||
|
|
||
| closeSummarySheet.isEnabled = false | ||
| } else { | ||
|
|
@@ -265,20 +266,25 @@ class SelectionMapFragment( | |
| } | ||
|
|
||
| private fun onFeatureClicked(featureId: Int, maintainZoom: Boolean = true) { | ||
| val item = itemsByFeatureId[featureId] | ||
| val selectedItem = selectedItemViewModel.getSelectedItem() | ||
|
|
||
| if (item != null) { | ||
| if (selectedItem != null && selectedItem.id != item.id) { | ||
| resetIcon(selectedItem) | ||
| } | ||
|
|
||
| if (!skipSummary) { | ||
| if (item.points.size > 1) { | ||
| map.zoomToBoundingBox(item.points, 0.8, true) | ||
|
There was a problem hiding this comment. We're doing a "zoom to fit" when selecting a shape/trace rather than maintaining the user zoom. I think that addresses some of the feedback around it being hard to see which item is selected (without having to deal with color/shape changes), but as @lognaturel has pointed out to me, it isn't great in situations where the user taps on the wrong item and then loses context. |
||
| } else { | ||
| val point = item.points[0] | ||
|
|
||
| if (maintainZoom) { | ||
| map.zoomToPoint(MapPoint(point.latitude, point.longitude), map.zoom, true) | ||
| } else { | ||
| map.zoomToPoint(MapPoint(point.latitude, point.longitude), true) | ||
| } | ||
| } | ||
|
|
||
| map.setMarkerIcon( | ||
|
|
@@ -298,7 +304,7 @@ class SelectionMapFragment( | |
| } | ||
| ) | ||
|
|
||
| selectedItemViewModel.setSelectedItem(item) | ||
| } else { | ||
| parentFragmentManager.setFragmentResult( | ||
| REQUEST_SELECT_ITEM, | ||
|
|
@@ -323,10 +329,13 @@ class SelectionMapFragment( | |
|
|
||
| val previouslySelectedItem = | ||
| itemsByFeatureId.filter { it.value.selected }.map { it.key }.firstOrNull() | ||
| val selectedItem = selectedItemViewModel.getSelectedItem() | ||
|
|
||
| if (selectedItem != null) { | ||
| val featureId = featureIdsByItemId[selectedItem.id] | ||
| if (featureId != null) { | ||
| onFeatureClicked(featureId) | ||
| } | ||
| } else if (previouslySelectedItem != null) { | ||
| onFeatureClicked(previouslySelectedItem, maintainZoom = false) | ||
| } else if (!map.hasCenter()) { | ||
|
|
@@ -341,12 +350,14 @@ class SelectionMapFragment( | |
| } | ||
| } | ||
|
|
||
| private fun resetIcon(selectedItem: MappableSelectItem) { | ||
| val featureId = featureIdsByItemId[selectedItem.id] | ||
| if (featureId != null) { | ||
| map.setMarkerIcon( | ||
| featureId, | ||
| MarkerIconDescription(selectedItem.smallIcon, selectedItem.color, selectedItem.symbol) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -376,8 +387,9 @@ class SelectionMapFragment( | |
| ids + map.addPoly(item.points, false, false) | ||
| } | ||
|
|
||
| (singlePoints + traces).zip(pointIds + traceIds).forEach { (item, featureId) -> | ||
| itemsByFeatureId[featureId] = item | ||
| featureIdsByItemId[item.id] = featureId | ||
| points.addAll(item.points) | ||
| } | ||
|
|
||
|
|
@@ -391,16 +403,16 @@ class SelectionMapFragment( | |
| } | ||
| } | ||
|
|
||
| internal class SelectedItemViewModel : ViewModel() { | ||
|
|
||
| private var selectedItem: MappableSelectItem? = null | ||
|
|
||
| fun getSelectedItem(): MappableSelectItem? { | ||
| return selectedItem | ||
| } | ||
|
|
||
| fun setSelectedItem(item: MappableSelectItem?) { | ||
| selectedItem = item | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It maybe feels excessive to have two
Mapindexes here, but otherwise we'd need to do linear searches on several click events, and we build these maps in a loop we're already performing.