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

Merge fixes (rebase routing with master).

Browse source
This commit is contained in:
vng 2014-10-21 17:30:20 +03:00 • committed by Alex Zolotarev
parent 112b4e628d
commit f84fb4669a
5 changed files with 144 additions and 345 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto-bw.bin
View file

Binary file not shown.

485
data/drules_proto-bw.txt
View file

@ -4534,82 +4534,6 @@ cont {
}
}
}
cont {
name: "area:highway-living_street"
element {
scale: 15
area {
color: 7829367
priority: 1368
}
}
element {
scale: 16
area {
color: 7829367
priority: 1368
}
}
element {
scale: 17
area {
color: 7829367
priority: 1368
}
}
element {
scale: 18
area {
color: 7829367
priority: 1368
}
}
element {
scale: 19
area {
color: 7829367
priority: 1368
}
}
}
cont {
name: "area:highway-motorway"
element {
scale: 15
area {
color: 16746496
priority: 1368
}
}
element {
scale: 16
area {
color: 16746496
priority: 1368
}
}
element {
scale: 17
area {
color: 16746496
priority: 1368
}
}
element {
scale: 18
area {
color: 16746496
priority: 1368
}
}
element {
scale: 19
area {
color: 16746496
priority: 1368
}
}
}
cont {
name: "area:highway-path"
element {
@ -4721,158 +4645,6 @@ cont {
}
}
}
cont {
name: "area:highway-primary"
element {
scale: 15
area {
color: 16772710
priority: 1368
}
}
element {
scale: 16
area {
color: 16772710
priority: 1368
}
}
element {
scale: 17
area {
color: 16772710
priority: 1368
}
}
element {
scale: 18
area {
color: 16772710
priority: 1368
}
}
element {
scale: 19
area {
color: 16772710
priority: 1368
}
}
}
cont {
name: "area:highway-residential"
element {
scale: 15
area {
color: 16777215
priority: 1368
}
}
element {
scale: 16
area {
color: 16777215
priority: 1368
}
}
element {
scale: 17
area {
color: 16777215
priority: 1368
}
}
element {
scale: 18
area {
color: 16777215
priority: 1368
}
}
element {
scale: 19
area {
color: 16777215
priority: 1368
}
}
}
cont {
name: "area:highway-secondary"
element {
scale: 15
area {
color: 16777096
priority: 1368
}
}
element {
scale: 16
area {
color: 16777096
priority: 1368
}
}
element {
scale: 17
area {
color: 16777096
priority: 1368
}
}
element {
scale: 18
area {
color: 16777096
priority: 1368
}
}
element {
scale: 19
area {
color: 16777096
priority: 1368
}
}
}
cont {
name: "area:highway-service"
element {
scale: 15
area {
color: 16777215
priority: 1368
}
}
element {
scale: 16
area {
color: 16777215
priority: 1368
}
}
element {
scale: 17
area {
color: 16777215
priority: 1368
}
}
element {
scale: 18
area {
color: 16777215
priority: 1368
}
}
element {
scale: 19
area {
color: 16777215
priority: 1368
}
}
}
cont {
name: "area:highway-steps"
element {
@ -4911,120 +4683,6 @@ cont {
}
}
}
cont {
name: "area:highway-tertiary"
element {
scale: 15
area {
color: 16777096
priority: 1368
}
}
element {
scale: 16
area {
color: 16777096
priority: 1368
}
}
element {
scale: 17
area {
color: 16777096
priority: 1368
}
}
element {
scale: 18
area {
color: 16777096
priority: 1368
}
}
element {
scale: 19
area {
color: 16777096
priority: 1368
}
}
}
cont {
name: "area:highway-trunk"
element {
scale: 15
area {
color: 16763972
priority: 1368
}
}
element {
scale: 16
area {
color: 16763972
priority: 1368
}
}
element {
scale: 17
area {
color: 16763972
priority: 1368
}
}
element {
scale: 18
area {
color: 16763972
priority: 1368
}
}
element {
scale: 19
area {
color: 16763972
priority: 1368
}
}
}
cont {
name: "area:highway-unclassified"
element {
scale: 15
area {
color: 16777215
priority: 1368
}
}
element {
scale: 16
area {
color: 16777215
priority: 1368
}
}
element {
scale: 17
area {
color: 16777215
priority: 1368
}
}
element {
scale: 18
area {
color: 16777215
priority: 1368
}
}
element {
scale: 19
area {
color: 16777215
priority: 1368
}
}
}
cont {
name: "barrier-block"
element {
@ -47558,6 +47216,149 @@ cont {
}
}
}
cont {
name: "route-ferry-motorcar"
element {
scale: 10
lines {
width: 1.0
color: 10075118
dashdot {
dd: 3.0
dd: 2.0
}
priority: 1158
join: ROUNDJOIN
cap: BUTTCAP
}
}
element {
scale: 11
lines {
width: 1.0
color: 10075118
dashdot {
dd: 3.0
dd: 2.0
}
priority: 1158
join: ROUNDJOIN
cap: BUTTCAP
}
}
element {
scale: 12
lines {
width: 1.0
color: 10075118
dashdot {
dd: 3.0
dd: 2.0
}
priority: 1352
join: ROUNDJOIN
cap: BUTTCAP
}
}
element {
scale: 13
lines {
width: 1.0
color: 10075118
dashdot {
dd: 3.0
dd: 2.0
}
priority: 1387
join: ROUNDJOIN
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.0
color: 10075118
dashdot {
dd: 3.0
dd: 2.0
}
priority: 1450
join: ROUNDJOIN
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.0
color: 10075118
dashdot {
dd: 7.0
dd: 5.0
}
priority: 1621
join: ROUNDJOIN
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 2.0
color: 11193565
dashdot {
dd: 12.0
dd: 8.0
}
priority: 1803
join: ROUNDJOIN
cap: BUTTCAP
}
}
element {
scale: 17
lines {
width: 2.0
color: 11193565
dashdot {
dd: 12.0
dd: 8.0
}
priority: 1910
join: ROUNDJOIN
cap: BUTTCAP
}
}
element {
scale: 18
lines {
width: 2.0
color: 11193565
dashdot {
dd: 12.0
dd: 8.0
}
priority: 1910
join: ROUNDJOIN
cap: BUTTCAP
}
}
element {
scale: 19
lines {
width: 2.0
color: 11193565
dashdot {
dd: 12.0
dd: 8.0
}
priority: 1910
join: ROUNDJOIN
cap: BUTTCAP
}
}
}
cont {
name: "shop"
element {

BIN
data/drules_proto.bin
View file

Binary file not shown.

1
iphone/Maps/Classes/PlacePageView.mm
View file

@ -1,4 +1,3 @@
#import "PlacePageView.h"
#import "MapsAppDelegate.h"
#import "MapViewController.h"

3
map/location_state.cpp
View file

@ -612,7 +612,7 @@ void State::CacheArrow(graphics::DisplayList * dl, const string & iconName)
bool State::IsRotationActive() const
{
return m_framework->GetNavigator().DoSupportRotation() && TestModeBit(m_modeInfo, KnownDirectionBit);
return m_framework->GetNavigator().DoSupportRotation() && IsDirectionKnown();
}
bool State::IsDirectionKnown() const
@ -714,7 +714,6 @@ void State::StopCompassFollowing()
void State::StopLocationFollow()
{
StopCompassFollowing();
if (GetMode() > NotFollow)
{
StopAllAnimations();