diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 1cb9c4f9d4..ffee432881 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 25d8ee81d4..5e1fb02957 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -5161,6 +5161,84 @@ cont { } } } +cont { + name: "amenity-vending_machine-parking_tickets" + element { + scale: 17 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } +} +cont { + name: "amenity-vending_machine-public_transport_tickets" + element { + scale: 17 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } +} cont { name: "amenity-waste_disposal" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 00d2bbbfe4..f835c72209 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 869b5cffbd..4b68292e63 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/resources-6plus/symbols.sdf b/data/resources-6plus/symbols.sdf index 38a36c18cc..71717c9318 100644 --- a/data/resources-6plus/symbols.sdf +++ b/data/resources-6plus/symbols.sdf @@ -1,179 +1,179 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 388827aada..569569e55c 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index 0e1657202f..e28f277f6d 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-hdpi/symbols.sdf b/data/resources-hdpi/symbols.sdf index ffcb90da95..2fe16013c4 100644 --- a/data/resources-hdpi/symbols.sdf +++ b/data/resources-hdpi/symbols.sdf @@ -1,179 +1,179 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index a2e2e00203..06f6056455 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 28a32d8c6d..20892b4e3e 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-ldpi/symbols.sdf b/data/resources-ldpi/symbols.sdf index d14ce5a648..b5babad62a 100644 --- a/data/resources-ldpi/symbols.sdf +++ b/data/resources-ldpi/symbols.sdf @@ -1,179 +1,179 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-ldpi_clear/symbols.png b/data/resources-ldpi_clear/symbols.png index c0137f1379..571b160e26 100644 Binary files a/data/resources-ldpi_clear/symbols.png and b/data/resources-ldpi_clear/symbols.png differ diff --git a/data/resources-ldpi_dark/symbols.png b/data/resources-ldpi_dark/symbols.png index c4505a2f53..0d46ceaa10 100644 Binary files a/data/resources-ldpi_dark/symbols.png and b/data/resources-ldpi_dark/symbols.png differ diff --git a/data/resources-ldpi_dark/symbols.sdf b/data/resources-ldpi_dark/symbols.sdf index 94feaf94e0..3cd271312f 100644 --- a/data/resources-ldpi_dark/symbols.sdf +++ b/data/resources-ldpi_dark/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-mdpi/symbols.sdf b/data/resources-mdpi/symbols.sdf index 88a765a6f6..9457595bfc 100644 --- a/data/resources-mdpi/symbols.sdf +++ b/data/resources-mdpi/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index 8add74a631..2fa0ed6080 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index cdeefb9985..5cdb3225af 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index e7859efeea..9342cd3a5a 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index ac0f376757..eee8eabb6e 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index 08f58ed65d..4424c2c806 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -1,450 +1,450 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index 13af91a2c7..cd2da8a88f 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xxhdpi/symbols.sdf b/data/resources-xxhdpi/symbols.sdf index 8cf97b1188..2d2a512040 100644 --- a/data/resources-xxhdpi/symbols.sdf +++ b/data/resources-xxhdpi/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index 3ed7232b5c..11dd9cb1db 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index 83a2dde9bd..ad127e5aab 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -1,450 +1,450 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index 999ab6dc6d..8aa2ffb519 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-yota/symbols.sdf b/data/resources-yota/symbols.sdf index ac31337562..14ae67f309 100644 --- a/data/resources-yota/symbols.sdf +++ b/data/resources-yota/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/styles/clear/style-clear/symbols/america-football-s.svg b/data/styles/clear/style-clear/symbols/america-football-s.svg new file mode 100644 index 0000000000..c4d9d88d74 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/america-football-s.svg @@ -0,0 +1,14 @@ + + + + america-football-s + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/iphone/Maps/Classes/MWMPlacePageViewManager.mm b/iphone/Maps/Classes/MWMPlacePageViewManager.mm index 1cbc360cb5..846b7aecff 100644 --- a/iphone/Maps/Classes/MWMPlacePageViewManager.mm +++ b/iphone/Maps/Classes/MWMPlacePageViewManager.mm @@ -198,7 +198,8 @@ typedef NS_ENUM(NSUInteger, MWMPlacePageManagerState) m2::PointD const & destination = m_userMark->GetUserMark()->GetPivot(); m2::PointD const myPosition([MapsAppDelegate theApp].m_locationManager.lastLocation.mercator); using namespace location; - [self.delegate buildRouteFrom:mode != State::Mode::UnknownPosition && mode != State::Mode::PendingPosition ? + EMyPositionMode mode = self.delegate.myPositionMode; + [self.delegate buildRouteFrom:mode != EMyPositionMode::MODE_UNKNOWN_POSITION && mode != EMyPositionMode::MODE_PENDING_POSITION ? MWMRoutePoint(myPosition) : MWMRoutePoint::MWMRoutePointZero() to:{destination, self.placePage.basePlacePageView.titleLabel.text}]; diff --git a/iphone/Maps/Classes/MWMPlacePageViewManagerDelegate.h b/iphone/Maps/Classes/MWMPlacePageViewManagerDelegate.h index bf345cda8f..dea0d17c82 100644 --- a/iphone/Maps/Classes/MWMPlacePageViewManagerDelegate.h +++ b/iphone/Maps/Classes/MWMPlacePageViewManagerDelegate.h @@ -1,7 +1,11 @@ #import "MWMRoutingProtocol.h" +#include "platform/location.hpp" + @protocol MWMPlacePageViewManagerProtocol +@property (nonatomic) location::EMyPositionMode myPositionMode; + - (void)dragPlacePage:(CGRect)frame; - (void)addPlacePageViews:(NSArray *)views; - (void)updateStatusBarStyle;