drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ios] Fixed wrong coordinates access for pure suggestion search results

Browse Source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk
2025-07-13 21:46:45 +03:00
committed by Yannik Bloscheck
parent 2cd1d9df3c
commit 9a50b3b147
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
iphone/Maps/Core/Search/SearchResult.mm
View File

@@ -36,18 +36,19 @@
if (result.IsSuggest()) if (result.IsSuggest())
_suggestion = @(result.GetSuggestionString().c_str()); _suggestion = @(result.GetSuggestionString().c_str());
auto const & pivot = result.GetFeatureCenter(); _distanceText = nil;
_point = CGPointMake(pivot.x, pivot.y); if (result.HasPoint()) {
auto const location = mercator::ToLatLon(pivot); auto const center = result.GetFeatureCenter();
_coordinate = CLLocationCoordinate2DMake(location.m_lat, location.m_lon); _point = CGPointMake(center.x, center.y);
auto const [centerLat, centerLon] = mercator::ToLatLon(center);
_coordinate = CLLocationCoordinate2DMake(centerLat, centerLon);
CLLocation * lastLocation = [MWMLocationManager lastLocation]; CLLocation * lastLocation = [MWMLocationManager lastLocation];
if (lastLocation && result.HasPoint()) { if (lastLocation) {
double distanceInMeters = mercator::DistanceOnEarth(lastLocation.mercator, result.GetFeatureCenter()); double const distanceM = mercator::DistanceOnEarth(lastLocation.mercator, center);
std::string distanceStr = platform::Distance::CreateFormatted(distanceInMeters).ToString(); std::string const distanceStr = platform::Distance::CreateFormatted(distanceM).ToString();
_distanceText = @(distanceStr.c_str()); _distanceText = @(distanceStr.c_str());
} else { }
_distanceText = nil;
} }
switch (result.IsOpenNow()) { switch (result.IsOpenNow()) {