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

[ios] added map rotation feature.

Browse source
This commit is contained in:
rachytski 2012-11-13 13:29:24 +03:00 • committed by Alex Zolotarev
parent 4234bc7a37
commit d153b65b03
5 changed files with 74 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,33 +106,76 @@
{
GetFramework().OnCompassUpdate(info);
}
- (void) onCompassStatusChanged:(int) newStatus
{
Framework & f = GetFramework();
shared_ptr<location::State> ls = f.GetLocationState();
if (newStatus == 1)
[m_myPositionButton setImage:[UIImage imageNamed:@"location-follow.png"] forState:UIControlStateSelected];
else
{
if (ls->HasPosition())
[m_myPositionButton setImage:[UIImage imageNamed:@"location-selected.png"] forState:UIControlStateSelected];
else
[m_myPositionButton setImage:[UIImage imageNamed:@"location.png"] forState:UIControlStateSelected];
m_myPositionButton.selected = YES;
}
}
//********************************************************************************************
//********************************************************************************************
- (IBAction)OnMyPositionClicked:(id)sender
{
Framework & f = GetFramework();
shared_ptr<location::State> ls = f.GetLocationState();
if (m_myPositionButton.isSelected == NO)
if (!ls->HasPosition())
{
m_myPositionButton.selected = YES;
[m_myPositionButton setImage:[UIImage imageNamed:@"location-search.png"] forState:UIControlStateSelected];
f.StartLocation();
[[MapsAppDelegate theApp] disableStandby];
[[MapsAppDelegate theApp].m_locationManager start:self];
if (!ls->IsFirstPosition())
{
m_myPositionButton.selected = YES;
[m_myPositionButton setImage:[UIImage imageNamed:@"location-search.png"] forState:UIControlStateSelected];
f.StartLocation();
[[MapsAppDelegate theApp] disableStandby];
[[MapsAppDelegate theApp].m_locationManager start:self];
return;
}
}
else
{
m_myPositionButton.selected = NO;
[m_myPositionButton setImage:[UIImage imageNamed:@"location.png"] forState:UIControlStateSelected];
f.StopLocation();
[[MapsAppDelegate theApp] enableStandby];
[[MapsAppDelegate theApp].m_locationManager stop:self];
if (GetPlatform().IsPro())
{
if (ls->HasCompass())
{
if (ls->GetCompassProcessMode() != location::ECompassFollow)
{
ls->StartCompassFollowing();
m_myPositionButton.selected = YES;
[m_myPositionButton setImage:[UIImage imageNamed:@"location-follow.png"] forState:UIControlStateSelected];
return;
}
else
ls->StopCompassFollowing();
}
}
}
f.StopLocation();
[[MapsAppDelegate theApp] enableStandby];
[[MapsAppDelegate theApp].m_locationManager stop:self];
m_myPositionButton.selected = YES;
[m_myPositionButton setImage:[UIImage imageNamed:@"location.png"] forState:UIControlStateSelected];
}
- (IBAction)OnSettingsClicked:(id)sender
@ -321,6 +364,13 @@
EAGLView * v = (EAGLView *)self.view;
Framework & f = GetFramework();
typedef void (*onCompassStatusChangedFn)(id, SEL, int);
SEL onCompassStatusChangedSel = @selector(onCompassStatusChanged:);
onCompassStatusChangedFn onCompassStatusChangedImpl = (onCompassStatusChangedFn)[self methodForSelector:onCompassStatusChangedSel];
shared_ptr<location::State> ls = f.GetLocationState();
ls->AddCompassStatusListener(bind(onCompassStatusChangedImpl, self, onCompassStatusChangedSel, _1));
f.AddString("country_status_added_to_queue", [NSLocalizedString(@"country_status_added_to_queue", @"Message to display at the center of the screen when the country is added to the downloading queue") UTF8String]);
f.AddString("country_status_downloading", [NSLocalizedString(@"country_status_downloading", @"Message to display at the center of the screen when the country is downloading") UTF8String]);

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

@ -21,6 +21,8 @@
49B3FB8D132FA43E00057053 /* location.png in Resources */ = {isa = PBXBuildFile; fileRef = 49B3FB8B132FA43E00057053 /* location.png */; };
49B3FB8E132FA43E00057053 /* location@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 49B3FB8C132FA43E00057053 /* location@2x.png */; };
49DE1CA413437D7A00A93417 /* libbzip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DE1CA213437D7A00A93417 /* libbzip2.a */; };
573D1AF4165252760093A55D /* location-follow.png in Resources */ = {isa = PBXBuildFile; fileRef = 573D1AF2165252760093A55D /* location-follow.png */; };
573D1AF5165252760093A55D /* location-follow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 573D1AF3165252760093A55D /* location-follow@2x.png */; };
EE026F0611D6AC0D00645242 /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; };
EE026F0D11D6AC2800645242 /* basic_mdpi.skn in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0811D6AC2800645242 /* basic_mdpi.skn */; };
EE12020911CD464100ABDD5D /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE1201FF11CD464100ABDD5D /* libbase.a */; };
@ -1357,6 +1359,8 @@
49B3FB8B132FA43E00057053 /* location.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = location.png; sourceTree = "<group>"; };
49B3FB8C132FA43E00057053 /* location@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location@2x.png"; sourceTree = "<group>"; };
49DE1CA213437D7A00A93417 /* libbzip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libbzip2.a; sourceTree = SOURCE_ROOT; };
573D1AF2165252760093A55D /* location-follow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location-follow.png"; sourceTree = "<group>"; };
573D1AF3165252760093A55D /* location-follow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location-follow@2x.png"; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* MapsWithMe-Pro.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "MapsWithMe-Pro.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
EE026F0511D6AC0D00645242 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = classificator.txt; path = ../../data/classificator.txt; sourceTree = SOURCE_ROOT; };
EE026F0811D6AC2800645242 /* basic_mdpi.skn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = basic_mdpi.skn; path = ../../data/basic_mdpi.skn; sourceTree = SOURCE_ROOT; };
@ -2189,6 +2193,8 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
573D1AF2165252760093A55D /* location-follow.png */,
573D1AF3165252760093A55D /* location-follow@2x.png */,
FA8A71D0153D83C8005D9795 /* bookmarks-highlighted.png */,
FA8A71D1153D83C8005D9795 /* bookmarks-highlighted@2x.png */,
FA8A71D2153D83C8005D9795 /* bookmarks.png */,
@ -3646,6 +3652,8 @@
FA140653162A6288002BC1ED /* empty.png in Resources */,
FA140655162A6288002BC1ED /* eye.png in Resources */,
FA140657162A6288002BC1ED /* eye@2x.png in Resources */,
573D1AF4165252760093A55D /* location-follow.png in Resources */,
573D1AF5165252760093A55D /* location-follow@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

BIN
iphone/Maps/location-follow.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
iphone/Maps/location-follow@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.9 KiB

2
platform/platform_ios.mm
View file

@ -174,7 +174,7 @@ string Platform::UniqueClientId() const
bool Platform::DoSupportRotation() const
{
return false;
return true;
}
static void PerformImpl(void * obj)