[generator] Reduce CDN upload script logging verbosity

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

android/app/build.gradle

@@ -254,6 +254,7 @@ android {
   androidResources {
     ignoreAssetsPattern = '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
     noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
+    // Some languages not supported by Android require to be specified here to be applied
     localeFilters += [
             "af",
             "ar",
@@ -281,6 +282,7 @@ android {
             "in",
             "it",
             "ja",
+            "kw",
             "ko",
             "lt",
             "lv",

android/app/src/main/res/xml/locales_config.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Some languages not supported by Android require to be specified here to be applied -->
     <locale android:name="en" />
     <locale android:name="af" />
     <locale android:name="ar" />
@@ -26,6 +27,7 @@
     <locale android:name="in" />
     <locale android:name="it" />
     <locale android:name="ja" />
+    <locale android:name="kw" />
     <locale android:name="ko" />
     <locale android:name="lt" />
     <locale android:name="lv" />

data/styles/vehicle/include/Basemap.mapcss

@@ -352,6 +352,7 @@ area|z13-[landuse=garages],
 
 area|z15-[amenity=charging_station][motorcar?],
 area|z15-[amenity=fuel],
+area|z15-[amenity=recycling][recycling_type=centre],
 area|z17-[amenity=vehicle_inspection],
 area|z17-[amenity=car_wash],
 area|z17-[amenity=motorcycle_parking],

data/styles/vehicle/include/Icons.mapcss

@@ -373,6 +373,7 @@ node|z15-[amenity=university],
 node|z15-[amenity=hospital],
 node|z14-[barrier=toll_booth],
 node|z14-[barrier=border_control],
+node|z16-[amenity=recycling][recycling_type=centre],
 node|z16-[barrier=lift_gate],
 node|z16-[man_made=communications_tower],
 node|z17-[amenity=bank],
@@ -514,6 +515,9 @@ node|z18-[amenity=post_office],
 node|z18-[post_office=post_partner],
 {font-size: 11;}
 
+node|z16-[amenity=recycling][recycling_type=centre],
+{icon-image: recycling-centre-m.svg;}
+
 /* 6. SHOP */
 
 node|z14-[shop=mall],

data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt

@@ -36,6 +36,7 @@ amenity-car_wash                                    # area z17- (also has icon z
 amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
 amenity-charging_station-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-fuel                                        # area z15- (also has icon z12-, caption(optional) z12-)
+amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-vehicle_inspection                          # area z17- (also has icon z17-)
 highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z14-)
 highway-services                                    # area z13- (also has icon z12-, caption(optional) z13-)

data/styles/vehicle/include/priorities_4_overlays.prio.txt

@@ -220,6 +220,7 @@ railway-level_crossing                              # icon z17-
 === 2700
 
 amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z17-)
+amenity-recycling-centre                            # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-vehicle_inspection                          # icon z17- (also has area z17-)
 amenity-vending_machine-parking_tickets             # icon z17- (also has caption(optional) z17-)
 shop-car_parts                                      # icon z17-
@@ -820,6 +821,7 @@ entrance-emergency                                  # icon z19- (also has captio
 # === -7250
 
 # amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z17-)
+# amenity-recycling-centre                          # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-vending_machine-parking_tickets           # caption(optional) z17- (also has icon z17-)
 # shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # tourism-camp_site                                 # caption(optional) z18- (also has icon z18-)

libs/drape_frontend/user_event_stream.cpp

@@ -31,8 +31,8 @@ namespace df
 {
 namespace
 {
-uint64_t constexpr kDoubleTapPauseMs = 250;
-uint64_t constexpr kLongTouchMs = 500;
+uint64_t constexpr kDoubleTapPauseMs = 220;
+uint64_t constexpr kLongTouchMs = 700;
 uint64_t constexpr kKineticDelayMs = 500;
 
 float constexpr kForceTapThreshold = 0.75;

tools/python/maps_generator/README.md

@@ -184,11 +184,3 @@ E.g.,
 I(1) 0.11666 platform/string_storage_base.cpp:24 StringStorageBase(): Settings path: /Users/<user-name>/Library/Developer/CoreSimulator/Devices/EFE74BF2-2871-4364-A633-BC8F1BAB9DF3/data/Containers/Data/Application/252BDFA5-3E60-43A6-B09C-158BC55DC450/Documents/settings.ini
 ```
 In this folder the map file is in a YYMMDD subfolder
-
-## Changing Map Borders
-
-> TODO: this section is a work in progress and is probably missing parts.
-
-- Edit the various `data/borders/*.poly` files as needed, ideally sharing nodes between polygons to avoid gaps.
-  - These are Osmosis Polygon "osmpoly" files and there are multiple tools and editing options available: https://wiki.openstreetmap.org/wiki/Osmosis/Polygon_Filter_File_Format
-- Compile and run `generator_tool --generate_packed_borders` to generate `data/packed_polygons.bin` which is compiled into the app to define each "country" (MWM) name and perimeter.

tools/unix/maps/upload_to_cdn.sh

@@ -48,7 +48,7 @@ OLD_VERSIONS_RU1=$(rclone lsd ru1:comaps-maps/maps --max-depth 1 | awk '{print $
 for version in $OLD_VERSIONS_RU1; do
   if [ $version -gt 250101 ]; then
     echo "  Deleting ru1:comaps-maps/maps/$version/"
-    rclone purge -v ru1:comaps-maps/maps/$version/
+    rclone purge ru1:comaps-maps/maps/$version/
   fi
 done
 
@@ -58,7 +58,7 @@ OLD_VERSIONS_FI1=$(rclone lsd fi1:/var/www/html/maps --max-depth 1 | awk '{print
 for version in $OLD_VERSIONS_FI1; do
   if [ $version -gt 250101 ]; then
     echo "  Deleting fi1:/var/www/html/maps/$version/"
-    rclone purge -v fi1:/var/www/html/maps/$version/
+    rclone purge fi1:/var/www/html/maps/$version/
   fi
 done
 
@@ -68,7 +68,7 @@ OLD_VERSIONS_DE1=$(rclone lsd de1:/var/www/html/comaps-cdn/maps --max-depth 1 |
 for version in $OLD_VERSIONS_DE1; do
   if [ $version -gt 250101 ]; then
     echo "  Deleting de1:/var/www/html/comaps-cdn/maps/$version/"
-    rclone purge -v de1:/var/www/html/comaps-cdn/maps/$version/
+    rclone purge de1:/var/www/html/comaps-cdn/maps/$version/
   fi
 done
 
@@ -78,7 +78,7 @@ OLD_VERSIONS_FR1=$(rclone lsd fr1:/data/maps --max-depth 1 | awk '{print $5}' |
 for version in $OLD_VERSIONS_FR1; do
   if [ $version -gt 250101 ]; then
     echo "  Deleting fr1:/data/maps/$version/"
-    rclone purge -v fr1:/data/maps/$version/
+    rclone purge fr1:/data/maps/$version/
   fi
 done
 
@@ -89,19 +89,19 @@ echo "Old version cleanup complete"
 
 echo "Uploading to us2"
 # An explicit mwm/txt filter is used to skip temp files when run for an unfinished generation
-rclone copy -v --include "*.{mwm,txt}" $DIR us2:comaps-map-files/maps/$MAPS &
+rclone copy --include "*.{mwm,txt}" $DIR us2:comaps-map-files/maps/$MAPS &
 
 echo "Uploading to ru1"
-rclone copy -v --include "*.{mwm,txt}" $DIR ru1:comaps-maps/maps/$MAPS &
+rclone copy --include "*.{mwm,txt}" $DIR ru1:comaps-maps/maps/$MAPS &
 
 echo "Uploading to fi1"
-rclone copy -v --include "*.{mwm,txt}" $DIR fi1:/var/www/html/maps/$MAPS &
+rclone copy --include "*.{mwm,txt}" $DIR fi1:/var/www/html/maps/$MAPS &
 
 echo "Uploading to de1"
-rclone copy -v --include "*.{mwm,txt}" $DIR de1:/var/www/html/comaps-cdn/maps/$MAPS &
+rclone copy --include "*.{mwm,txt}" $DIR de1:/var/www/html/comaps-cdn/maps/$MAPS &
 
 echo "Uploading to fr1"
-rclone copy -v --include "*.{mwm,txt}" $DIR fr1:/data/maps/$MAPS &
+rclone copy --include "*.{mwm,txt}" $DIR fr1:/data/maps/$MAPS &
 
 # us1 is not used for maps atm
 # rclone lsd us1:/home/dh_zzxxrk/cdn-us-1.comaps.app/maps