-
-
Notifications
You must be signed in to change notification settings - Fork 69
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
add centerMapAt util to MeshMap #918
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,6 +33,7 @@ struct MeshMap: View { | |
@Namespace var mapScope | ||
@State var mapStyle: MapStyle = MapStyle.standard(elevation: .flat, emphasis: MapStyle.StandardEmphasis.muted, pointsOfInterest: .excludingAll, showsTraffic: false) | ||
@State var position = MapCameraPosition.automatic | ||
@State private var distance = 10000.0 | ||
@State private var editingSettings = false | ||
@State private var editingFilters = false | ||
@State var selectedPosition: PositionEntity? | ||
|
@@ -60,8 +61,19 @@ struct MeshMap: View { | |
NavigationStack { | ||
ZStack { | ||
MapReader { reader in | ||
Map(position: $position, bounds: MapCameraBounds(minimumDistance: 1, maximumDistance: .infinity), scope: mapScope) { | ||
MeshMapContent(showUserLocation: $showUserLocation, showTraffic: $showTraffic, showPointsOfInterest: $showPointsOfInterest, selectedMapLayer: $selectedMapLayer, selectedPosition: $selectedPosition, selectedWaypoint: $selectedWaypoint) | ||
Map( | ||
position: $position, | ||
bounds: MapCameraBounds(minimumDistance: 1, maximumDistance: .infinity), | ||
scope: mapScope | ||
) { | ||
MeshMapContent( | ||
showUserLocation: $showUserLocation, | ||
showTraffic: $showTraffic, | ||
showPointsOfInterest: $showPointsOfInterest, | ||
selectedMapLayer: $selectedMapLayer, | ||
selectedPosition: $selectedPosition, | ||
selectedWaypoint: $selectedWaypoint | ||
) | ||
} | ||
.mapScope(mapScope) | ||
.mapStyle(mapStyle) | ||
|
@@ -74,6 +86,9 @@ struct MeshMap: View { | |
.mapControlVisibility(.automatic) | ||
} | ||
.controlSize(.regular) | ||
.onMapCameraChange(frequency: MapCameraUpdateFrequency.continuous, { context in | ||
distance = context.camera.distance | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. map zoom distance value isn't available through |
||
}) | ||
.onTapGesture(count: 1, perform: { position in | ||
newWaypointCoord = reader.convert(position, from: .local) ?? CLLocationCoordinate2D.init() | ||
}) | ||
|
@@ -92,6 +107,7 @@ struct MeshMap: View { | |
Logger.services.error("Unable to convert local point to coordinate on map.") | ||
return | ||
} | ||
centerMapAt(coordinate: coordinate) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This was originally a quick hack for testing (since I don't have a way to access node data from Simulator), but centering the map on the location a waypoint is being proposed actually felt very intuitive so I decided to open this PR. |
||
|
||
newWaypointCoord = coordinate | ||
editingWaypoint = WaypointEntity(context: context) | ||
|
@@ -210,4 +226,18 @@ struct MeshMap: View { | |
UIApplication.shared.isIdleTimerDisabled = false | ||
}) | ||
} | ||
|
||
// moves the map to a new coordinate | ||
private func centerMapAt(coordinate: CLLocationCoordinate2D) { | ||
withAnimation(.easeInOut(duration: 0.2), { | ||
position = .camera( | ||
MapCamera( | ||
centerCoordinate: coordinate, // Set new center | ||
distance: distance, // Preserve current zoom distance | ||
heading: 0, // align north | ||
pitch: 0 // set view to top down | ||
) | ||
) | ||
}) | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,22 +23,22 @@ if [[ -e "${SWIFT_LINT}" ]]; then | |
##### Fix files or exit if no files found for fixing ##### | ||
if [ "$count" -ne 0 ]; then | ||
echo "Found files to fix! Running swiftLint --fix..." | ||
|
||
# Run SwiftLint --fix on each file | ||
for ((i = 0; i < count; i++)); do | ||
file_var="SCRIPT_INPUT_FILE_$i" | ||
file_path=${!file_var} | ||
echo "Fixing $file_path" | ||
$SWIFT_LINT --fix --path "$file_path" | ||
$SWIFT_LINT --fix "$file_path" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
done | ||
|
||
# Add the fixed files back to staging | ||
for ((i = 0; i < count; i++)); do | ||
file_var="SCRIPT_INPUT_FILE_$i" | ||
file_path=${!file_var} | ||
git add "$file_path" | ||
done | ||
|
||
echo "swiftLint --fix completed and files re-staged." | ||
|
||
# Optionally lint the fixed files | ||
|
@@ -61,4 +61,4 @@ if [[ -e "${SWIFT_LINT}" ]]; then | |
else | ||
echo "SwiftLint not installed. Please install from https://github.com/realm/SwiftLint" | ||
exit -1 | ||
fi | ||
fi |
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.
I think this initial value will only matter when someone tries to deep link to a node before they've zoomed into an area on this map. (initial map zoom is set separately by
MapCameraBounds(..., maximumDistance: .infinity),
It might be nice to tune this to whatever we find to be the most common ranges are when someone's wanting to view a point of interest. (be it waypoint or node)