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

refactored Location services.

Browse source
This commit is contained in:
rachytski 2011-03-29 03:57:21 +03:00 • committed by Alex Zolotarev
parent 7559dd7e54
commit 49c76e2a4d
16 changed files with 406 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/EAGLView.mm
View file

@ -61,7 +61,7 @@
if (ver >= 3.199)
{
UIScreen * mainScr = [UIScreen mainScreen];
scrW = mainScr.currentMode.size.width;
scrW = mainScr.currentMode.size.width;
if (scrW == 640)
self.contentScaleFactor = 2.0;
}

16
iphone/Maps/Classes/MapViewController.h
View file

@ -9,11 +9,10 @@
#include "../../map/navigator.hpp"
#include "../../map/feature_vec_model.hpp"
#include "../../std/shared_ptr.hpp"
#include "../../map/locator.hpp"
@interface MapViewController : UIViewController<UserLocationControllerDelegate>
@interface MapViewController : UIViewController
{
UserLocationController * m_locationController;
enum Action
{
NOTHING,
@ -30,12 +29,13 @@
- (id) initWithCoder: (NSCoder *)coder;
- (void) OnLocation: (m2::PointD const &) mercatorPoint
withErrorRadius: (double) errorRadius
withTimestamp: (NSDate *) timestamp;
- (void) OnHeading: (CLHeading*) heading;
- (void) OnUpdateLocation: (m2::PointD const &) mercatorPoint
withErrorRadius: (double) errorRadius
withLocTimeStamp: (double) locTimeStamp
withCurTimeStamp: (double) curTimeStamp;
- (void) OnLocationError: (NSString *) errorDescription;
- (void) OnChangeLocatorMode: (Locator::EMode) oldMode
withNewMode: (Locator::EMode) newMode;
- (void) onResize: (GLint)width withHeight: (GLint)height;
- (void) onPaint;

87
iphone/Maps/Classes/MapViewController.mm
View file

@ -4,6 +4,7 @@
#import "EAGLView.h"
#import "WindowHandle.h"
#import "../Settings/SettingsManager.h"
#import "IPhoneLocator.h"
#include "RenderContext.hpp"
#include "../../geometry/rect2d.hpp"
@ -12,27 +13,54 @@
#include "../../map/drawer_yg.hpp"
#include "../../storage/storage.hpp"
typedef FrameWork<model::FeaturesFetcher, Navigator, iphone::WindowHandle> framework_t;
typedef FrameWork<model::FeaturesFetcher, Navigator> framework_t;
@implementation MapViewController
// Make m_framework and m_storage MapsAppDelegate properties instead of global variables.
framework_t * m_framework = NULL;
shared_ptr<Locator> m_locator;
storage::Storage m_storage;
- (IBAction)OnMyPositionClicked:(id)sender
{
if (m_locationController.active)
if (m_locator->mode() == Locator::EPreciseMode)
{
[m_locationController Stop];
m_locator->setMode(Locator::ERoughMode);
((UIBarButtonItem *)sender).style = UIBarButtonItemStyleBordered;
m_framework->DisableMyPositionAndHeading();
}
else
{
[m_locationController Start];
((UIBarButtonItem *)sender).style = UIBarButtonItemStyleDone;
m_locator->setMode(Locator::EPreciseMode);
m_isDirtyPosition = true;
((UIBarButtonItem *)sender).style = UIBarButtonItemStyleDone;
/// TODO : change button icon to progress indicator
//UIActivityIndicatorView * indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle: UIActivityIndicatorViewStyleGray];
//((UIBarButtonItem *)sender).customView = indicator;
//[indicator release];
}
}
- (void) OnChangeLocatorMode:(Locator::EMode) oldMode
withNewMode:(Locator::EMode) newMode
{
if (newMode == Locator::ERoughMode)
{
/// TODO : change button icon to "rough mode"(UIBarButtonItemStyleBordered);
}
}
- (void) OnUpdateLocation: (m2::PointD const &) mercatorPoint
withErrorRadius: (double) errorRadius
withLocTimeStamp: (double) locTimeStamp
withCurTimeStamp: (double) curTimeStamp
{
if (m_isDirtyPosition)
{
/// TODO : change button icon to "precise" mode(UIBarButtonItemStyleDone).
}
}
@ -57,7 +85,7 @@ typedef FrameWork<model::FeaturesFetcher, Navigator, iphone::WindowHandle> frame
- (void) dealloc
{
[m_locationController release];
m_locator.reset();
delete m_framework;
[super dealloc];
}
@ -70,11 +98,25 @@ typedef FrameWork<model::FeaturesFetcher, Navigator, iphone::WindowHandle> frame
shared_ptr<iphone::WindowHandle> windowHandle = [(EAGLView*)self.view windowHandle];
shared_ptr<yg::ResourceManager> resourceManager = [(EAGLView*)self.view resourceManager];
m_framework = new framework_t(windowHandle, 40);
m_framework->Init(m_storage);
m_StickyThreshold = 10;
m_locator = shared_ptr<Locator>(new iphone::Locator());
// tricky boost::bind for objC class methods
typedef void (*TUpdateLocationFunc)(id, SEL, m2::PointD const &, double, double, double);
SEL updateLocationSel = @selector(OnUpdateLocation:withErrorRadius:withLocTimeStamp:withCurTimeStamp:);
TUpdateLocationFunc updateLocationImpl = (TUpdateLocationFunc)[self methodForSelector:updateLocationSel];
typedef void (*TChangeModeFunc)(id, SEL, Locator::EMode, Locator::EMode);
SEL changeModeSel = @selector(OnChangeLocatorMode:withNewMode:);
TChangeModeFunc changeModeImpl = (TChangeModeFunc)[self methodForSelector:changeModeSel];
m_locationController = [[UserLocationController alloc] initWithDelegate:self];
m_locator->addOnUpdateLocationFn(boost::bind(updateLocationImpl, self, updateLocationSel, _1, _2, _3, _4));
m_locator->addOnChangeModeFn(boost::bind(changeModeImpl, self, changeModeSel, _1, _2));
m_framework = new framework_t(windowHandle, 40);
m_framework->InitStorage(m_storage);
m_framework->InitLocator(m_locator);
m_StickyThreshold = 10;
m_CurrentAction = NOTHING;
m_isDirtyPosition = false;
@ -95,29 +137,6 @@ typedef FrameWork<model::FeaturesFetcher, Navigator, iphone::WindowHandle> frame
return self;
}
- (void) OnHeading: (CLHeading*) newHeading
{
m_framework->SetHeading(newHeading.trueHeading, newHeading.magneticHeading, newHeading.headingAccuracy);
}
- (void) OnLocation: (m2::PointD const &) mercatorPoint
withErrorRadius: (double) errorRadius
withTimestamp: (NSDate *) timestamp
{
m_framework->SetPosition(mercatorPoint, errorRadius);
if (m_isDirtyPosition)
{
m_framework->CenterAndScaleViewport();
m_isDirtyPosition = false;
}
}
- (void) OnLocationError: (NSString *) errorDescription
{
NSLog(@"Error: %@", errorDescription);
}
- (void)onResize:(GLint) width withHeight:(GLint) height
{
UIInterfaceOrientation orientation = [self interfaceOrientation];

9
iphone/Maps/Classes/UserLocationController.h
View file

@ -15,17 +15,18 @@
@interface UserLocationController : NSObject<CLLocationManagerDelegate>
{
@private
CLLocationManager * m_locationManager;
//@private
// CLLocationManager * m_locationManager;
@public
id delegate;
BOOL active;
// BOOL active;
}
@property (nonatomic, assign) id delegate;
@property (nonatomic, assign) CLLocationManager * locationManager;
/// YES means that location manager is active
@property (nonatomic, assign) BOOL active;
//@property (nonatomic, assign) BOOL active;
- (id) initWithDelegate: (id) locationDelegate;
- (void) Start;

25
iphone/Maps/Classes/UserLocationController.mm
View file

@ -5,16 +5,17 @@
@implementation UserLocationController
@synthesize delegate;
@synthesize active;
//@synthesize active;
@synthesize locationManager;
- (id) init
{
self = [super init];
if (self != nil)
{
m_locationManager = [[CLLocationManager alloc] init];
m_locationManager.delegate = self;
active = NO;
self.locationManager = [[CLLocationManager alloc] init];
self.locationManager.delegate = self;
// active = NO;
}
return self;
}
@ -28,18 +29,18 @@
- (void) dealloc
{
[self Stop];
[m_locationManager release];
[self.locationManager release];
[super dealloc];
}
- (void) Start
{
active = YES;
[m_locationManager startUpdatingLocation];
// active = YES;
[self.locationManager startUpdatingLocation];
if ([CLLocationManager headingAvailable])
{
m_locationManager.headingFilter = 1;
[m_locationManager startUpdatingHeading];
self.locationManager.headingFilter = 1;
[self.locationManager startUpdatingHeading];
}
else
NSLog(@"heading information is not available");
@ -47,9 +48,9 @@
- (void) Stop
{
[m_locationManager stopUpdatingLocation];
[m_locationManager stopUpdatingHeading];
active = NO;
[self.locationManager stopUpdatingLocation];
[self.locationManager stopUpdatingHeading];
// active = NO;
}
- (void) locationManager: (CLLocationManager *) manager

57
iphone/Maps/IPhoneLocator.h Normal file
View file

@ -0,0 +1,57 @@
//
// IPhoneLocator.h
// Maps
//
// Created by Siarhei Rachytski on 3/28/11.
// Copyright 2011 MapsWithMe. All rights reserved.
//
#include "../../map/locator.hpp"
#include "UserLocationController.h"
namespace iphone
{
class Locator;
}
@interface LocatorThunk : NSObject<UserLocationControllerDelegate>
{
iphone::Locator * m_locator;
}
@property (nonatomic, assign) iphone::Locator * locator;
- (void) initWithLocator : (iphone::Locator*) locator;
- (void) OnLocation: (m2::PointD const &) mercatorPoint
withErrorRadius: (double) errorRadius
withTimestamp: (NSDate *) timestamp;
- (void) OnHeading: (CLHeading *)heading;
- (void) OnLocationError: (NSString *) errorDescription;
@end
namespace iphone
{
class Locator : public ::Locator
{
private:
LocatorThunk * m_thunk;
UserLocationController * m_locationController;
public:
Locator();
~Locator();
void start(EMode mode);
void stop();
void setMode(EMode mode);
void locationUpdate(m2::PointD const & pt, double errorRadius, double locTimeStamp, double curTimeStamp);
void headingUpdate(double trueHeading, double magneticHeading, double accuracy);
};
}

116
iphone/Maps/IPhoneLocator.mm Normal file
View file

@ -0,0 +1,116 @@
//
// IPhoneLocator.mm
// Maps
//
// Created by Siarhei Rachytski on 3/28/11.
// Copyright 2011 MapsWithMe. All rights reserved.
//
#include "IPhoneLocator.h"
#import <Foundation/NSDate.h>
@implementation LocatorThunk
@synthesize locator;
- (void) initWithLocator : (iphone::Locator *) loc
{
self.locator = loc;
}
- (void) OnLocation: (m2::PointD const &) mercatorPoint
withErrorRadius: (double) errorRadius
withTimestamp: (NSDate *) timestamp;
{
self.locator->locationUpdate(mercatorPoint,
errorRadius,
[timestamp timeIntervalSince1970],
[[NSDate date] timeIntervalSince1970]);
}
- (void) OnHeading: (CLHeading*) heading
{
self.locator->headingUpdate(heading.trueHeading,
heading.magneticHeading,
heading.headingAccuracy);
}
- (void) OnLocationError: (NSString*) error
{
NSLog(@"Error : %@", error);
}
@end
namespace iphone
{
Locator::Locator()
{
m_thunk = [LocatorThunk alloc];
[m_thunk initWithLocator:this];
m_locationController = [[UserLocationController alloc] initWithDelegate:m_thunk];
}
Locator::~Locator()
{
stop();
[m_locationController release];
[m_thunk release];
}
void Locator::start(EMode mode)
{
::Locator::setMode(mode);
if (mode == ERoughMode)
[m_locationController.locationManager startMonitoringSignificantLocationChanges];
else
[m_locationController.locationManager startUpdatingLocation];
if ([CLLocationManager headingAvailable])
{
m_locationController.locationManager.headingFilter = 1;
[m_locationController.locationManager startUpdatingHeading];
}
}
void Locator::stop()
{
if (mode() == ERoughMode)
[m_locationController.locationManager stopMonitoringSignificantLocationChanges];
else
[m_locationController.locationManager stopUpdatingLocation];
if ([CLLocationManager headingAvailable])
[m_locationController.locationManager stopUpdatingHeading];
}
void Locator::setMode(EMode mode)
{
EMode oldMode = ::Locator::mode();
::Locator::setMode(mode);
callOnChangeModeFns(oldMode, mode);
if (mode == ERoughMode)
{
[m_locationController.locationManager stopUpdatingLocation];
[m_locationController.locationManager startMonitoringSignificantLocationChanges];
}
else
{
[m_locationController.locationManager stopMonitoringSignificantLocationChanges];
[m_locationController.locationManager startUpdatingLocation];
}
}
void Locator::locationUpdate(m2::PointD const & pt, double errorRadius, double locTimeStamp, double curTimeStamp)
{
callOnUpdateLocationFns(pt, errorRadius, locTimeStamp, curTimeStamp);
}
void Locator::headingUpdate(double trueHeading, double magneticHeading, double accuracy)
{
callOnUpdateHeadingFns(trueHeading, magneticHeading, accuracy);
}
}

8
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -36,6 +36,7 @@
EE7F29811219ECA300EB67A9 /* RenderBuffer.mm in Sources */ = {isa = PBXBuildFile; fileRef = EE7F297D1219ECA300EB67A9 /* RenderBuffer.mm */; };
EE7F29821219ECA300EB67A9 /* RenderContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = EE7F297E1219ECA300EB67A9 /* RenderContext.mm */; };
EE7F29831219ECA300EB67A9 /* WindowHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = EE7F29801219ECA300EB67A9 /* WindowHandle.mm */; };
EE9588BC134114F50056F2D5 /* IPhoneLocator.mm in Sources */ = {isa = PBXBuildFile; fileRef = EE9588BB134114F50056F2D5 /* IPhoneLocator.mm */; };
EEB7E22211E9079400080A68 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEB7E22111E9079400080A68 /* CoreLocation.framework */; };
EEB7E30911E9094F00080A68 /* UserLocationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = EEB7E30811E9094F00080A68 /* UserLocationController.mm */; };
EED10A4511F78D120095FAD4 /* MapViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = EED10A4411F78D120095FAD4 /* MapViewController.mm */; };
@ -132,6 +133,7 @@
EE7F297E1219ECA300EB67A9 /* RenderContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = RenderContext.mm; path = Classes/RenderContext.mm; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
EE7F297F1219ECA300EB67A9 /* WindowHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = WindowHandle.h; path = Classes/WindowHandle.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
EE7F29801219ECA300EB67A9 /* WindowHandle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = WindowHandle.mm; path = Classes/WindowHandle.mm; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
EE9588BB134114F50056F2D5 /* IPhoneLocator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = IPhoneLocator.mm; sourceTree = "<group>"; };
EEB7E22111E9079400080A68 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
EEB7E30711E9094F00080A68 /* UserLocationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = UserLocationController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
EEB7E30811E9094F00080A68 /* UserLocationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = UserLocationController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@ -139,6 +141,7 @@
EEE4C93D1298A2F3007231A9 /* symbols_24.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbols_24.png; path = ../../data/symbols_24.png; sourceTree = SOURCE_ROOT; };
EEE4C93F1298A303007231A9 /* symbols_48.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbols_48.png; path = ../../data/symbols_48.png; sourceTree = SOURCE_ROOT; };
EEE4C9411298A31B007231A9 /* basic_highres.skn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = basic_highres.skn; path = ../../data/basic_highres.skn; sourceTree = SOURCE_ROOT; };
EEE8F9C2134106AB001DC91A /* IPhoneLocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IPhoneLocator.h; sourceTree = "<group>"; };
EEF5745412DE1AD50082F472 /* libfribidi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfribidi.a; sourceTree = SOURCE_ROOT; };
EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_blacklist.txt; path = ../../data/fonts_blacklist.txt; sourceTree = "<group>"; };
EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_whitelist.txt; path = ../../data/fonts_whitelist.txt; sourceTree = "<group>"; };
@ -190,7 +193,7 @@
FAF37F03126DCF11005EA154 /* IPhoneDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = IPhoneDownload.h; path = Platform/IPhoneDownload.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
FAFCB63413366E78001A5C59 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = "<group>"; };
FAFCB63513366E78001A5C59 /* WebViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewController.mm; sourceTree = "<group>"; };
FAFCB63713367AD1001A5C59 /* about-travelguide-iphone.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = about-travelguide-iphone.html; path = ../../data/about-travelguide-iphone.html; sourceTree = SOURCE_ROOT; };
FAFCB63713367AD1001A5C59 /* about-travelguide-iphone.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "about-travelguide-iphone.html"; path = "../../data/about-travelguide-iphone.html"; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -414,6 +417,8 @@
FAF37EFA126DCE6F005EA154 /* IPhoneDownload.mm */,
FAF37EFE126DCE6F005EA154 /* IPhonePlatform.hpp */,
FAF37EFD126DCE6F005EA154 /* IPhonePlatform.mm */,
EEE8F9C2134106AB001DC91A /* IPhoneLocator.h */,
EE9588BB134114F50056F2D5 /* IPhoneLocator.mm */,
);
name = Platform;
sourceTree = "<group>";
@ -543,6 +548,7 @@
49DD2B51132FA8880031D82E /* GuideViewController.mm in Sources */,
FAFCB63613366E78001A5C59 /* WebViewController.mm in Sources */,
FA34BECA1338D72F00FFB2A7 /* CustomAlertView.mm in Sources */,
EE9588BC134114F50056F2D5 /* IPhoneLocator.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

46
map/framework.hpp
View file

@ -4,6 +4,8 @@
#include "drawer_yg.hpp"
#include "render_queue.hpp"
#include "information_display.hpp"
#include "locator.hpp"
#include "window_handle.hpp"
#include "../defines.hpp"
@ -85,20 +87,19 @@ namespace fwork
template
<
class TModel,
class TNavigator,
class TWindowHandle
class TNavigator
>
class FrameWork
{
typedef TModel model_t;
typedef TNavigator navigator_t;
typedef TWindowHandle window_handle_t;
typedef FrameWork<model_t, navigator_t, window_handle_t> this_type;
typedef FrameWork<model_t, navigator_t> this_type;
model_t m_model;
navigator_t m_navigator;
shared_ptr<window_handle_t> m_windowHandle;
shared_ptr<WindowHandle> m_windowHandle;
shared_ptr<Locator> m_locator;
bool m_isBenchmarking;
bool m_isBenchmarkInitialized;
@ -160,7 +161,8 @@ class FrameWork
}
public:
FrameWork(shared_ptr<window_handle_t> windowHandle, size_t bottomShift)
FrameWork(shared_ptr<WindowHandle> windowHandle,
size_t bottomShift)
: m_windowHandle(windowHandle),
m_isBenchmarking(GetPlatform().IsBenchmarking()),
m_isBenchmarkInitialized(false),
@ -229,7 +231,7 @@ public:
/// Initialization.
template <class TStorage>
void Init(TStorage & storage)
void InitStorage(TStorage & storage)
{
m_model.InitClassificator();
@ -239,6 +241,15 @@ public:
bind(&FrameWork::RepaintRect, this, _1));
}
void InitLocator(shared_ptr<Locator> const & locator)
{
m_locator = locator;
m_locator->addOnUpdateLocationFn(bind(&this_type::UpdateLocation, this, _1, _2, _3, _4));
m_locator->addOnUpdateHeadingFn(bind(&this_type::UpdateHeading, this, _1, _2, _3));
m_locator->addOnChangeModeFn(bind(&this_type::ChangeLocatorMode, this, _1, _2));
m_locator->start(Locator::ERoughMode);
}
bool IsEmptyModel()
{
return m_model.GetWorldRect() == m2::RectD::GetEmptyRect();
@ -449,21 +460,29 @@ public:
}
}
void DisableMyPositionAndHeading()
/* void DisableMyPositionAndHeading()
{
m_informationDisplay.enablePosition(false);
m_informationDisplay.enableHeading(false);
UpdateNow();
}
}*/
void SetPosition(m2::PointD const & mercatorPos, double errorRadius)
void UpdateLocation(m2::PointD const & mercatorPos, double errorRadius, double locTimeStamp, double curTimeStamp)
{
m_informationDisplay.setPosition(mercatorPos, errorRadius);
if ((m_locator->mode() == Locator::EPreciseMode)
&& (curTimeStamp - locTimeStamp >= 0)
&& (curTimeStamp - locTimeStamp < 60 * 5))
CenterAndScaleViewport();
UpdateNow();
}
void ChangeLocatorMode(Locator::EMode oldMode, Locator::EMode newMode)
{
m_informationDisplay.setLocatorMode(newMode);
}
void CenterViewport(m2::PointD const & pt)
{
m_navigator.CenterViewport(pt);
@ -521,7 +540,7 @@ public:
UpdateNow();
}
void SetHeading(double trueHeading, double magneticHeading, double accuracy)
void UpdateHeading(double trueHeading, double magneticHeading, double accuracy)
{
m_informationDisplay.setHeading(trueHeading, magneticHeading, accuracy);
Invalidate();
@ -568,6 +587,9 @@ public:
}
void DoDrag(DragEvent const & e)
{
if (m_locator->mode() == Locator::EPreciseMode)
m_locator->setMode(Locator::ERoughMode);
m2::PointD ptShift = m_renderQueue.renderState().coordSystemShift(true);
m2::PointD pos = m_navigator.OrientPoint(e.Pos()) + ptShift;

15
map/information_display.cpp
View file

@ -16,7 +16,8 @@
#include "../base/mutex.hpp"
InformationDisplay::InformationDisplay()
: m_headingOrientation(-math::pi / 2)
: m_headingOrientation(-math::pi / 2),
m_mode(Locator::ERoughMode)
{
enablePosition(false);
enableHeading(false);
@ -96,8 +97,13 @@ void InformationDisplay::drawPosition(DrawerYG * pDrawer)
double pxErrorRadius = pxPosition.Length(m_screen.GtoP(m_position + m2::PointD(m_errorRadius, 0)));
pDrawer->screen()->drawArc(pxPosition, 0, math::pi * 2, pxErrorRadius, yg::Color(0, 0, 255, 32), yg::maxDepth - 2);
pDrawer->screen()->fillSector(pxPosition, 0, math::pi * 2, pxErrorRadius, yg::Color(0, 0, 255, 32), yg::maxDepth - 3);
pDrawer->screen()->drawArc(pxPosition, 0, math::pi * 2, pxErrorRadius, yg::Color(0, 0, 255, m_mode == Locator::EPreciseMode ? 64 : 32), yg::maxDepth - 2);
pDrawer->screen()->fillSector(pxPosition, 0, math::pi * 2, pxErrorRadius, yg::Color(0, 0, 255, m_mode == Locator::EPreciseMode ? 64 : 32), yg::maxDepth - 3);
}
void InformationDisplay::setLocatorMode(Locator::EMode mode)
{
m_mode = mode;
}
void InformationDisplay::enableHeading(bool doEnable)
@ -115,6 +121,9 @@ void InformationDisplay::setHeading(double trueHeading, double magneticHeading,
void InformationDisplay::drawHeading(DrawerYG *pDrawer)
{
if (m_mode == Locator::ERoughMode)
return;
double trueHeadingRad = m_trueHeading / 180 * math::pi;
double headingAccuracyRad = m_headingAccuracy / 180 * math::pi;

3
map/information_display.hpp
View file

@ -1,6 +1,7 @@
#pragma once
#include "window_handle.hpp"
#include "locator.hpp"
#include "../geometry/point2d.hpp"
#include "../geometry/rect2d.hpp"
#include "../geometry/screenbase.hpp"
@ -27,6 +28,7 @@ private:
double m_headingAccuracy;
bool m_isPositionEnabled;
Locator::EMode m_mode;
m2::PointD m_position;
double m_errorRadius;
@ -85,6 +87,7 @@ public:
void enablePosition(bool doEnable);
void setPosition(m2::PointD const & mercatorPos, double errorRadius);
void setLocatorMode(Locator::EMode mode);
m2::PointD const & position() const;
double errorRadius() const;
void drawPosition(DrawerYG * pDrawer);

33
map/locator.cpp Normal file
View file

@ -0,0 +1,33 @@
#include "../base/SRC_FIRST.hpp"
#include "locator.hpp"
void Locator::setMode(EMode mode)
{
m_mode = mode;
}
Locator::EMode Locator::mode() const
{
return m_mode;
}
void Locator::callOnChangeModeFns(EMode oldMode, EMode newMode)
{
list<onChangeModeFn> handlers = m_onChangeModeFns;
for (list<onChangeModeFn>::iterator it = handlers.begin(); it != handlers.end(); ++it)
(*it)(oldMode, newMode);
}
void Locator::callOnUpdateLocationFns(m2::PointD const & pt, double errorRadius, double locTimeStamp, double curTimeStamp)
{
list<onUpdateLocationFn> handlers = m_onUpdateLocationFns;
for (list<onUpdateLocationFn>::iterator it = handlers.begin(); it != handlers.end(); ++it)
(*it)(pt, errorRadius, locTimeStamp, curTimeStamp);
}
void Locator::callOnUpdateHeadingFns(double trueHeading, double magneticHeading, double accuracy)
{
list<onUpdateHeadingFn> handlers = m_onUpdateHeadingFns;
for (list<onUpdateHeadingFn>::iterator it = handlers.begin(); it != handlers.end(); ++it)
(*it)(trueHeading, magneticHeading, accuracy);
}

58
map/locator.hpp Normal file
View file

@ -0,0 +1,58 @@
#pragma once
#include "../std/list.hpp"
#include "../std/function.hpp"
#include "../geometry/point2d.hpp"
/// Base class for OS-dependent implementation of locator
class Locator
{
public:
enum EMode
{
ERoughMode, //< monitor only significant place changes, saves battery.
EPreciseMode //< monitor place changes with the maximum available accuracy
};
typedef function<void (m2::PointD const & /*latLongPos*/, double /*errorRadius*/, double /*locationTimeStamp*/, double /*currentTimeStamp*/)> onUpdateLocationFn;
typedef function<void (double /*trueHeading*/, double /*magneticHeading*/, double /*accuracy*/)> onUpdateHeadingFn;
typedef function<void (EMode /*oldMode*/, EMode /*newMode*/)> onChangeModeFn;
private:
list<onUpdateLocationFn> m_onUpdateLocationFns;
list<onUpdateHeadingFn> m_onUpdateHeadingFns;
list<onChangeModeFn> m_onChangeModeFns;
EMode m_mode;
public:
virtual void start(EMode mode) = 0;
virtual void stop() = 0;
virtual void setMode(EMode mode) = 0;
EMode mode() const;
template <typename Fn>
void addOnUpdateLocationFn(Fn fn)
{
m_onUpdateLocationFns.push_back(fn);
}
template <typename Fn>
void addOnUpdateHeadingFn(Fn fn)
{
m_onUpdateHeadingFns.push_back(fn);
}
template <typename Fn>
void addOnChangeModeFn(Fn fn)
{
m_onChangeModeFns.push_back(fn);
}
void callOnUpdateLocationFns(m2::PointD const & pt, double errorRadius, double locTimeStamp, double curTimeStamp);
void callOnUpdateHeadingFns(double trueHeading, double magneticHeading, double accuracy);
void callOnChangeModeFns(EMode oldMode, EMode newMode);
};

2
map/map.pro
View file

@ -22,6 +22,7 @@ HEADERS += \
render_queue_routine.hpp \
information_display.hpp \
settings.hpp \
locator.hpp
SOURCES += \
feature_vec_model.cpp \
@ -33,6 +34,7 @@ SOURCES += \
render_queue_routine.cpp \
information_display.cpp \
settings.cpp \
locator.cpp
!iphone*:!bada* {
HEADERS += qgl_render_context.hpp

4
qt/draw_widget.cpp
View file

@ -16,13 +16,13 @@ namespace qt
{
DrawWidget::DrawWidget(QWidget * pParent, Storage & storage)
: base_type(pParent),
m_handle(new handle_t(this)),
m_handle(new qt::WindowHandle(this)),
m_framework(m_handle, 0),
m_isDrag(false),
m_redrawInterval(100),
m_pScale(0)
{
m_framework.Init(storage);
m_framework.InitStorage(storage);
m_timer = new QTimer(this);
connect(m_timer, SIGNAL(timeout()), this, SLOT(ScaleTimerElapsed()));
}

5
qt/draw_widget.hpp
View file

@ -26,12 +26,11 @@ namespace qt
{
typedef widget_type base_type;
typedef qt::WindowHandle handle_t;
shared_ptr<handle_t> m_handle;
shared_ptr<qt::WindowHandle> m_handle;
typedef model::FeaturesFetcher model_t;
FrameWork<model_t, Navigator, handle_t> m_framework;
FrameWork<model_t, Navigator> m_framework;
bool m_isDrag;