From f84fb4669a65d1198bc7609fe508623ac08f8310 Mon Sep 17 00:00:00 2001 From: vng Date: Tue, 21 Oct 2014 17:30:20 +0300 Subject: [PATCH] Merge fixes (rebase routing with master). --- data/drules_proto-bw.bin | Bin 151987 -> 151619 bytes data/drules_proto-bw.txt | 485 ++++++++------------------- data/drules_proto.bin | Bin 187444 -> 187076 bytes iphone/Maps/Classes/PlacePageView.mm | 1 - map/location_state.cpp | 3 +- 5 files changed, 144 insertions(+), 345 deletions(-) diff --git a/data/drules_proto-bw.bin b/data/drules_proto-bw.bin index 91022d8d281c7eea8a8419539b22d8b57db42554..410997133140d0982b48c97449573b545850eb33 100644 GIT binary patch delta 58 zcmdnInDg)g&JFeYo1F}p87Ch$ifOhr*=}pXxcQC58)hz%qWsd5RNb`HqM}OO-29UK OqU6M)?UM3Lvy1?qa~16X delta 882 zcma))!AiqG5QeD=O$R|6t<)lj7jM#>eH5|MHCgRqo5&_rytpl1dK7x;QSb$X9`XR~ zLrBr9C-Lgdm@!+YTLgQ{N8tZv{@Kw(Vfa{hQdR2|Dok>A*x&1xl)Y-LRV?fC<8`_G z3@NP}R5ZvoXoCo9Q2NPii1WrZyE$kDQ6SR~9pAbC%2Pa1aX-x<#C#&m*EGDXuH@7) zY#NeFDOyZU9d9qmjDrYQAVLKZDl|bI%0{~6q42mL3D(TEP*#%6Du_@)gbE^5Xo3^i zG87?q1K*<+dPY7G=Jygcm7{=uqCgYOHxzPtC0wqrKtth?i548c-*swg{?HMZX+yt9 zps`Rvlx^_;0!LsQ4Mno;U+D42gCwu$6(MGX;Y8RD5w@cV7;GEiZQpIOFcfEkdka>y WlNtX$@!iCUCr&PYk2||dBj+1Byb@Ue diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt index a2e92d88aa..4db262dd1e 100644 --- a/data/drules_proto-bw.txt +++ b/data/drules_proto-bw.txt @@ -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 { diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 7065bc433caba12a3ae1729946b7a9d1bcb4b571..25882e10deea606b56c054094531beb2c375efa9 100644 GIT binary patch delta 62 zcmV-E0KxyXxC_L!3$Qynv;H~*0h50{T!Z;OhxtAMxA{H-4`~?e0}2#!Z*_EKEoNnM Ua(OLnZ**^RV_|Z)F{T0oHag=Nq5uE@ delta 871 zcmb`Fu};EJ6oykYp*ff+1q|{4PP#d@anh$SVz|PM+$gQNts1AAILK&1QkWc_HEQqy zcnn<~b#(LELoXgKiw_cpzHJbUPf%e0}N zBhXl=Aj&rQeSsZtjD{k4;veeqM+24LrdNcR5rz|CJ4D!yCSb5K4(~TYtGx9OrCcW7 SRpMF0#LJb$aB!Pj+xP~<2M?bB diff --git a/iphone/Maps/Classes/PlacePageView.mm b/iphone/Maps/Classes/PlacePageView.mm index 4532d31f1a..cb3cc39946 100644 --- a/iphone/Maps/Classes/PlacePageView.mm +++ b/iphone/Maps/Classes/PlacePageView.mm @@ -1,4 +1,3 @@ - #import "PlacePageView.h" #import "MapsAppDelegate.h" #import "MapViewController.h" diff --git a/map/location_state.cpp b/map/location_state.cpp index 3780949982..133cc88bd0 100644 --- a/map/location_state.cpp +++ b/map/location_state.cpp @@ -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();