pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Closed #347 - check for invalid rect and location

Browse source
This commit is contained in:
Alex Zolotarev 2011-11-15 20:41:32 +03:00 • committed by Alex Zolotarev
parent c47199b229
commit fe1c07f091
5 changed files with 39 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
iphone/Maps/Platform/LocationManager.mm
View file

@ -94,17 +94,21 @@
- (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation
{
if (m_reportFirstUpdate)
if (location::IsLatValid(newLocation.coordinate.latitude)
&& location::IsLonValid(newLocation.coordinate.longitude))
{
for (id observer in m_observers)
[observer onLocationStatusChanged:location::EFirstEvent];
m_reportFirstUpdate = NO;
}
if (m_reportFirstUpdate)
{
for (id observer in m_observers)
[observer onLocationStatusChanged:location::EFirstEvent];
m_reportFirstUpdate = NO;
}
location::GpsInfo newInfo;
[self location:newLocation toGpsInfo:newInfo];
for (id observer in m_observers)
[observer onGpsUpdate:newInfo];
location::GpsInfo newInfo;
[self location:newLocation toGpsInfo:newInfo];
for (id observer in m_observers)
[observer onGpsUpdate:newInfo];
}
}
- (void)locationManager:(CLLocationManager *)manager didUpdateHeading:(CLHeading *)newHeading

5
map/framework.cpp
View file

@ -217,10 +217,7 @@ void Framework<TModel>::SaveState()
template <typename TModel>
bool Framework<TModel>::LoadState()
{
if (!m_navigator.LoadState())
return false;
return true;
return m_navigator.LoadState();
}
//@}

6
map/navigator.cpp
View file

@ -76,6 +76,12 @@ bool Navigator::LoadState()
if (!Settings::Get("ScreenClipRect", rect))
return false;
// additional check for valid rect
m2::RectD const r = rect.GetGlobalRect();
if (r.minX() < MercatorBounds::minX || r.minY() < MercatorBounds::minY
|| r.maxX() > MercatorBounds::maxX || r.maxY() > MercatorBounds::maxY)
return false;
SetFromRect(rect);
return true;
}

10
platform/location.hpp
View file

@ -52,4 +52,14 @@ namespace location
// int m_y;
// int m_z;
};
static inline bool IsLatValid(double lat)
{
return lat != 0. && lat < 90. && lat > -90.;
}
static inline bool IsLonValid(double lon)
{
return lon != 0. && lon < 180. && lon > -180.;
}
} // namespace location

15
platform/wifi_location_service.cpp
View file

@ -42,12 +42,15 @@ namespace location
GpsInfo info;
info.m_latitude = json_real_value(lat);
info.m_longitude = json_real_value(lon);
info.m_horizontalAccuracy = json_real_value(acc);
// @TODO introduce flags to mark valid values
info.m_timestamp = static_cast<double>(time(NULL));
info.m_source = location::EGoogle;
m_observer.OnGpsUpdated(info);
success = true;
if (IsLatValid(info.m_latitude) && IsLonValid(info.m_latitude))
{
info.m_horizontalAccuracy = json_real_value(acc);
// @TODO introduce flags to mark valid values
info.m_timestamp = static_cast<double>(time(NULL));
info.m_source = location::EGoogle;
m_observer.OnGpsUpdated(info);
success = true;
}
}
}
}