diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2019-05-27 15:06:53 +0300 |
---|---|---|
committer | mpimenov <mpimenov@users.noreply.github.com> | 2019-05-30 18:53:51 +0300 |
commit | b0868d6d3f371a2aff5db043b219906c95502a42 (patch) | |
tree | aeac2e18d7fdae208b0e2ee919afd19c356b6614 /iphone | |
parent | c0fb90a4a8b1228144e564a1fd1734136201d549 (diff) |
[geometry] LatLon refactoring.
Diffstat (limited to 'iphone')
5 files changed, 11 insertions, 11 deletions
diff --git a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm index e6911311cd..c61111ff53 100644 --- a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm +++ b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm @@ -65,7 +65,7 @@ NSString * httpGe0Url(NSString * shortUrl) ms::LatLon const ll = self.object ? self.object.latLon : ms::LatLon(self.location.latitude, self.location.longitude); - string const & s = f.CodeGe0url(ll.lat, ll.lon, f.GetDrawScale(), title(self.object).UTF8String); + string const & s = f.CodeGe0url(ll.m_lat, ll.m_lon, f.GetDrawScale(), title(self.object).UTF8String); NSString * url = @(s.c_str()); if (!isShort) diff --git a/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm b/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm index 271daa4268..10b520f222 100644 --- a/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm +++ b/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm @@ -62,7 +62,7 @@ string GetDistance(m2::PointD const & from, m2::PointD const & to) string distance; auto const f = MercatorBounds::ToLatLon(from); auto const t = MercatorBounds::ToLatLon(to); - measurement_utils::FormatDistance(ms::DistanceOnEarth(f.lat, f.lon, t.lat, t.lon), distance); + measurement_utils::FormatDistance(ms::DistanceOnEarth(f.m_lat, f.m_lon, t.m_lat, t.m_lon), distance); return distance; } } // namespace diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index b1085e2c4c..34d71c8685 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -275,7 +275,7 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV auto const latLon = m_mapObject.GetLatLon(); NSMutableDictionary * noteInfo = [info mutableCopy]; noteInfo[kStatProblem] = self.note; - CLLocation * location = [[CLLocation alloc] initWithLatitude:latLon.lat longitude:latLon.lon]; + CLLocation * location = [[CLLocation alloc] initWithLatitude:latLon.m_lat longitude:latLon.m_lon]; [Statistics logEvent:kStatEditorProblemReport withParameters:noteInfo atLocation:location]; f.CreateNote(m_mapObject, osm::Editor::NoteProblemType::General, self.note.UTF8String); } @@ -948,7 +948,7 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV { auto const & fid = m_mapObject.GetID(); auto const latLon = m_mapObject.GetLatLon(); - CLLocation * location = [[CLLocation alloc] initWithLatitude:latLon.lat longitude:latLon.lon]; + CLLocation * location = [[CLLocation alloc] initWithLatitude:latLon.m_lat longitude:latLon.m_lon]; self.isFeatureUploaded = osm::Editor::Instance().IsFeatureUploaded(fid.m_mwmId, fid.m_index); NSIndexPath * ip = [self.tableView indexPathForCell:cell]; [self.tableView reloadRowsAtIndexPaths:@[ ip ] withRowAnimation:UITableViewRowAnimationFade]; diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm index cc80da7a82..86383dd078 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm @@ -43,25 +43,25 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName) { stat[kStatProvider] = kStatBooking; stat[kStatHotel] = data.sponsoredId; - stat[kStatHotelLocation] = makeLocationEventValue(latLon.lat, latLon.lon); + stat[kStatHotelLocation] = makeLocationEventValue(latLon.m_lat, latLon.m_lon); } else if (data.isOpentable) { stat[kStatProvider] = kStatOpentable; stat[kStatRestaurant] = data.sponsoredId; - stat[kStatRestaurantLocation] = makeLocationEventValue(latLon.lat, latLon.lon); + stat[kStatRestaurantLocation] = makeLocationEventValue(latLon.m_lat, latLon.m_lon); } else if (data.isPartner) { stat[kStatProvider] = data.partnerName; stat[kStatCategory] = @(data.ratingRawValue); - stat[kStatObjectLat] = @(latLon.lat); - stat[kStatObjectLon] = @(latLon.lon); + stat[kStatObjectLat] = @(latLon.m_lat); + stat[kStatObjectLon] = @(latLon.m_lon); } else { stat[kStatProvider] = kStatPlacePageHotelSearch; - stat[kStatHotelLocation] = makeLocationEventValue(latLon.lat, latLon.lon); + stat[kStatHotelLocation] = makeLocationEventValue(latLon.m_lat, latLon.m_lon); } [Statistics logEvent:eventName withParameters:stat atLocation:[MWMLocationManager lastLocation]]; @@ -188,7 +188,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page: CLLocationCoordinate2D const & coord = lastLocation.coordinate; ms::LatLon const & target = data.latLon; measurement_utils::FormatDistance( - ms::DistanceOnEarth(coord.latitude, coord.longitude, target.lat, target.lon), distance); + ms::DistanceOnEarth(coord.latitude, coord.longitude, target.m_lat, target.m_lon), distance); return @(distance.c_str()); } diff --git a/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm b/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm index b2b2303582..e6cc7d0608 100644 --- a/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm +++ b/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm @@ -11,7 +11,7 @@ static int8_t kAgeOfChild = 5; if (self) { _types.insert(ftypes::IsHotelChecker::Type::Hotel); - CHECK(data.hotelType, ("Incorrect hotel type at coordinate:", data.latLon.lat, data.latLon.lon)); + CHECK(data.hotelType, ("Incorrect hotel type at coordinate:", data.latLon.m_lat, data.latLon.m_lon)); if (data.isBooking) { |