diff options
| -rw-r--r-- | android/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | android/proguard-mwm.txt | 5 | ||||
| -rw-r--r-- | data/drules_proto.bin | bin | 199784 -> 199455 bytes | |||
| -rw-r--r-- | data/drules_proto.txt | 168 | ||||
| -rw-r--r-- | data/drules_proto_vehicle_clear.bin | bin | 128145 -> 127577 bytes | |||
| -rw-r--r-- | data/drules_proto_vehicle_clear.txt | 163 | ||||
| -rw-r--r-- | data/drules_proto_vehicle_dark.bin | bin | 127193 -> 126641 bytes | |||
| -rw-r--r-- | data/drules_proto_vehicle_dark.txt | 163 | ||||
| -rw-r--r-- | data/styles/vehicle/include/Basemap.mapcss | 10 | ||||
| -rw-r--r-- | data/visibility.txt | 6 | ||||
| -rw-r--r-- | generator/osm2type.cpp | 16 | ||||
| -rw-r--r-- | iphone/Maps/Classes/MapsAppDelegate.mm | 7 |
12 files changed, 73 insertions, 469 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 7bfa1195b5..1985c4c760 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -331,10 +331,6 @@ android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:theme="@android:style/Theme.Translucent.NoTitleBar"/> - <activity - android:name="ru.mail.android.mytarget.ads.MyTargetActivity" - android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/> - <activity android:name="com.mopub.common.MoPubBrowser" android:configChanges="keyboardHidden|orientation|screenSize"/> <receiver diff --git a/android/proguard-mwm.txt b/android/proguard-mwm.txt index 65326b03ef..455d402a17 100644 --- a/android/proguard-mwm.txt +++ b/android/proguard-mwm.txt @@ -19,7 +19,10 @@ -dontwarn com.arellomobile.** # myTarget --keep class com.my.target.** {*;} +# Remove this dontwarn when MyTarget is updated to 4.6.15 +-dontwarn com.my.target.nativeads.mediation.** +# Remove this dontwarn when MyTarget is updated to 4.6.16 +-dontwarn com.my.target.core.net.cookie.** -dontwarn com.mopub.** -dontoptimize diff --git a/data/drules_proto.bin b/data/drules_proto.bin Binary files differindex 582e84a57b..e095383e02 100644 --- a/data/drules_proto.bin +++ b/data/drules_proto.bin diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 41d4678182..ba7689916f 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -64464,37 +64464,6 @@ cont { } } cont { - name: "waterway-ditch-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-dock" element { scale: 0 @@ -64683,37 +64652,6 @@ cont { } } cont { - name: "waterway-drain-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-lock" element { scale: 16 @@ -64960,93 +64898,83 @@ cont { cont { name: "waterway-river-tunnel" element { - scale: 10 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { scale: 11 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 12 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 13 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 14 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 15 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 16 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 17 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } element { scale: 18 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP + path_text { + primary { + height: 9 + color: 4495803 + } + priority: 16921 } } } diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin Binary files differindex 3a5ae96282..ab9c185bf1 100644 --- a/data/drules_proto_vehicle_clear.bin +++ b/data/drules_proto_vehicle_clear.bin diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 7f17bb9710..6d429996a3 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -39588,51 +39588,6 @@ cont { } } cont { - name: "waterway-ditch-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-dock" element { scale: 0 @@ -39821,51 +39776,6 @@ cont { } } cont { - name: "waterway-drain-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-lock" element { scale: 16 @@ -40112,24 +40022,7 @@ cont { cont { name: "waterway-river-tunnel" element { - scale: 10 - lines { - width: 1.0 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { scale: 11 - lines { - width: 1.2 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40140,13 +40033,6 @@ cont { } element { scale: 12 - lines { - width: 1.2 - color: 3584191 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40157,13 +40043,6 @@ cont { } element { scale: 13 - lines { - width: 1.6 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40174,13 +40053,6 @@ cont { } element { scale: 14 - lines { - width: 1.8 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40191,13 +40063,6 @@ cont { } element { scale: 15 - lines { - width: 2.2 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 11 @@ -40208,13 +40073,6 @@ cont { } element { scale: 16 - lines { - width: 2.2 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40225,13 +40083,6 @@ cont { } element { scale: 17 - lines { - width: 2.2 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40242,13 +40093,6 @@ cont { } element { scale: 18 - lines { - width: 2.2 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40259,13 +40103,6 @@ cont { } element { scale: 19 - lines { - width: 2.2 - color: 3584191 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin Binary files differindex c059bf6512..40bea8a53d 100644 --- a/data/drules_proto_vehicle_dark.bin +++ b/data/drules_proto_vehicle_dark.bin diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index edb14fbf32..bdc5b195ed 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -39588,51 +39588,6 @@ cont { } } cont { - name: "waterway-ditch-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-dock" element { scale: 0 @@ -39821,51 +39776,6 @@ cont { } } cont { - name: "waterway-drain-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-lock" element { scale: 16 @@ -40112,24 +40022,7 @@ cont { cont { name: "waterway-river-tunnel" element { - scale: 10 - lines { - width: 1.0 - color: 401446 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } - } - element { scale: 11 - lines { - width: 1.2 - color: 401446 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40140,13 +40033,6 @@ cont { } element { scale: 12 - lines { - width: 1.2 - color: 401446 - priority: 1921 - join: BEVELJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40157,13 +40043,6 @@ cont { } element { scale: 13 - lines { - width: 1.6 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40174,13 +40053,6 @@ cont { } element { scale: 14 - lines { - width: 1.8 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 9 @@ -40191,13 +40063,6 @@ cont { } element { scale: 15 - lines { - width: 2.2 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: BUTTCAP - } path_text { primary { height: 11 @@ -40208,13 +40073,6 @@ cont { } element { scale: 16 - lines { - width: 2.2 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40225,13 +40083,6 @@ cont { } element { scale: 17 - lines { - width: 2.2 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40242,13 +40093,6 @@ cont { } element { scale: 18 - lines { - width: 2.2 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 @@ -40259,13 +40103,6 @@ cont { } element { scale: 19 - lines { - width: 2.2 - color: 401446 - priority: 1921 - join: ROUNDJOIN - cap: ROUNDCAP - } path_text { primary { height: 11 diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 07268b5407..9e8d4edf49 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -358,11 +358,6 @@ area|z11-[natural=wetland], /* 6.2 Line water(river,canal etc.) */ -/* Do not draw tunnel waterways */ - -line[waterway][tunnel] -{width: 0;} - line|z10[waterway=river], line|z10[waterway=riverbank], {width: 1;} @@ -411,6 +406,11 @@ line|z17-[waterway=ditch], line|z17-[waterway=drain], {width: 1.8;opacity: 1;color: @river;dashes: 0.9,0.9;} +/* Do not draw tunnel waterways */ + +line[waterway][tunnel] +{width: 0;} + /* 7.LANDUSE */ area|z10-[aeroway=airport][aerodrome=international], diff --git a/data/visibility.txt b/data/visibility.txt index f439154cda..43cb9403f5 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -886,16 +886,16 @@ world 00000000000000000000 + {} dam 00000000000000011111 - ditch 00000000000000000111 + - tunnel 00000000000000000111 - + tunnel 00000000000000000000 - {} dock 11111111111111111111 - drain 00000000000000000111 + - tunnel 00000000000000000111 - + tunnel 00000000000000000000 - {} lock 00000000000000001111 - lock_gate 00000000000000001111 - river 00000000001111111111 + - tunnel 00000000001111111111 - + tunnel 00000000000111111111 - {} riverbank 11111111111111111111 - stream 00000000000000000000 + diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index b2ea830ac5..7dae069095 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -305,13 +305,15 @@ namespace ftype current = path.back().get(); // Next objects trying to find by value first. - ClassifObjectPtr pObj = - ForEachTagEx<ClassifObjectPtr>(p, skipRows, [¤t](string const & k, string const & v) - { - if (!NeedMatchValue(k, v)) - return ClassifObjectPtr(); - return current->BinaryFind(v); - }); + // Prevent merging different tags (e.g. shop=pet from shop=abandoned, was:shop=pet). + ClassifObjectPtr pObj = + path.size() == 1 ? ClassifObjectPtr() + : ForEachTagEx<ClassifObjectPtr>( + p, skipRows, [¤t](string const & k, string const & v) { + if (!NeedMatchValue(k, v)) + return ClassifObjectPtr(); + return current->BinaryFind(v); + }); if (pObj) { diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index c081cef0de..c4f3dd9c00 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -936,9 +936,10 @@ using namespace osm_auth_ios; - (void)showAlertIfRequired { - if ([self shouldShowRateAlert]) - [self performSelector:@selector(showRateAlert) withObject:nil afterDelay:30.0]; - else if ([self shouldShowFacebookAlert]) +// if ([self shouldShowRateAlert]) +// [self performSelector:@selector(showRateAlert) withObject:nil afterDelay:30.0]; +// else + if ([self shouldShowFacebookAlert]) [self performSelector:@selector(showFacebookAlert) withObject:nil afterDelay:30.0]; } |