From c3229b8fc004d46cbbc8a630ecf67864c9740c28 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Wed, 30 Sep 2015 17:45:22 +0300 Subject: [PATCH] Rebase fixes --- 3party/sdf_image/sdf_image.cpp | 9 +- 3party/sdf_image/sdf_image.h | 10 +- android/jni/com/mapswithme/maps/Framework.cpp | 4 +- android/jni/com/mapswithme/maps/Framework.hpp | 2 +- data/colors.txt | 28 +- data/drules_proto.txt | 8 + data/patterns.txt | 7 +- data/resources-6plus/symbols.sdf | 322 ++++----- data/resources-6plus_dark/symbols.sdf | 601 +++++++++-------- data/resources-hdpi/symbols.sdf | 2 +- data/resources-hdpi_clear/symbols.sdf | 534 +++++++-------- data/resources-hdpi_dark/symbols.sdf | 605 +++++++++-------- data/resources-ldpi_dark/symbols.sdf | 615 ++++++++++-------- data/resources-mdpi/symbols.sdf | 2 +- data/resources-mdpi_clear/symbols.sdf | 540 +++++++-------- data/resources-mdpi_dark/symbols.sdf | 585 +++++++++-------- data/resources-xhdpi_dark/symbols.sdf | 585 +++++++++-------- data/resources-xxhdpi/symbols.sdf | 354 +++++----- data/resources-xxhdpi_clear/symbols.sdf | 574 ++++++++-------- data/resources-xxhdpi_dark/symbols.sdf | 583 +++++++++-------- drape/drape_common.pri | 6 +- drape/glyph_manager.cpp | 6 +- drape_frontend/drape_frontend.pro | 2 +- drape_frontend/watch/software_renderer.cpp | 3 +- iphone/Maps/Classes/MapViewController.mm | 2 - .../Maps/Settings/SettingsViewController.mm | 2 +- map/framework.cpp | 2 +- 27 files changed, 3230 insertions(+), 2763 deletions(-) diff --git a/3party/sdf_image/sdf_image.cpp b/3party/sdf_image/sdf_image.cpp index 9732e6b694..912a0185ad 100644 --- a/3party/sdf_image/sdf_image.cpp +++ b/3party/sdf_image/sdf_image.cpp @@ -1,16 +1,13 @@ /* Copyright (C) 2009 by Stefan Gustavson - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -20,7 +17,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "drape/sdf_image.hpp" +#include "sdf_image.h" #include "base/math.hpp" #include "base/scope_guard.hpp" @@ -28,7 +25,7 @@ THE SOFTWARE. #include "std/limits.hpp" #include "std/bind.hpp" -namespace dp +namespace sdf_image { namespace @@ -508,4 +505,4 @@ bool SdfImage::Transform(int baseIndex, int offset, int dx, int dy, vector m_data; }; -} // namespace dp +} // namespace sdf_image diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 51ad9d4ec9..9a665562bb 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -291,9 +291,9 @@ void Framework::ShowSearchResult(search::Result const & r) m_work.ShowSearchResult(r); } -void Framework::ShowAllSearchResults() +void Framework::ShowAllSearchResults(search::Results const & results) { - m_work.ShowAllSearchResults(); + m_work.ShowAllSearchResults(results); } TIndex Framework::GetCountryIndex(double lat, double lon) const diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index 7a473dfbc6..fb30113b46 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -107,7 +107,7 @@ namespace android /// Show rect from another activity. Ensure that no LoadState will be called, /// when main map activity will become active. void ShowSearchResult(search::Result const & r); - void ShowAllSearchResults(); + void ShowAllSearchResults(search::Results const & results); bool Search(search::SearchParams const & params); string GetLastSearchQuery() { return m_searchQuery; } diff --git a/data/colors.txt b/data/colors.txt index 256723591f..dd56017893 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -10,6 +10,7 @@ 26112 1118464 1118481 +1122816 1131520 2232644 2236945 @@ -42,6 +43,7 @@ 7829350 7829367 8934809 +8943428 8947831 8947848 8960836 @@ -56,6 +58,7 @@ 10088089 11184793 11184810 +11189094 11193531 11193565 11197781 @@ -132,11 +135,15 @@ 439563059 440664064 440707584 +442909747 445155464 450708548 452954112 +452954282 452975974 452984831 +655434240 +665500518 856760832 857874961 857874978 @@ -149,7 +156,7 @@ 862340147 863467366 865704328 -866827127 +866827110 867941290 869059771 870178269 @@ -157,9 +164,12 @@ 872384512 872384682 872415231 +1074864640 +1084930918 1291854370 1292968448 1294078276 +1294082577 1294082594 1295196672 1295201058 @@ -167,18 +177,19 @@ 1298574028 1299674999 1300793480 -1303034743 +1303034726 1304148906 1305263086 1308592128 +1308618393 1308622847 +1511072256 +1521138534 1711293440 1712394496 -1712398848 1713508676 1713512977 1713512994 -1714631458 1714631475 1715732480 1715749939 @@ -189,7 +200,6 @@ 1719105399 1720223880 1721342344 -1722465143 1724693486 1724697787 1725776964 @@ -204,7 +214,7 @@ 2150834688 2156431496 2158668458 -2158672759 +2158672742 2159786922 2160901102 2162019498 @@ -213,11 +223,11 @@ 2164230144 2164230399 2164260863 -2366710272 -2376776567 +2568036864 2569151010 2570265088 2570269457 +2578103142 2579217339 2580335803 2582559556 @@ -228,13 +238,11 @@ 3003130504 3003147776 3004240128 -3004244480 3005354308 3005358609 3012056473 3012069512 3013209753 -3014310775 3014319598 3015407360 3015424955 diff --git a/data/drules_proto.txt b/data/drules_proto.txt index f4a0c84449..6987b64818 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -8212,6 +8212,7 @@ cont { primary { height: 10 color: 8947831 + text: "addr:housenumber" } secondary { height: 11 @@ -8232,6 +8233,7 @@ cont { primary { height: 11 color: 4473924 + text: "addr:housenumber" } secondary { height: 11 @@ -8252,6 +8254,7 @@ cont { primary { height: 11 color: 4473924 + text: "addr:housenumber" } secondary { height: 11 @@ -8272,6 +8275,7 @@ cont { primary { height: 11 color: 4473924 + text: "addr:housenumber" } secondary { height: 11 @@ -8291,6 +8295,7 @@ cont { primary { height: 10 color: 8947831 + text: "addr:housenumber" } priority: 15000 } @@ -8301,6 +8306,7 @@ cont { primary { height: 11 color: 4473924 + text: "addr:housenumber" } priority: 15000 } @@ -8311,6 +8317,7 @@ cont { primary { height: 11 color: 4473924 + text: "addr:housenumber" } priority: 15000 } @@ -8321,6 +8328,7 @@ cont { primary { height: 11 color: 4473924 + text: "addr:housenumber" } priority: 15000 } diff --git a/data/patterns.txt b/data/patterns.txt index 7599bac54b..0b3b6fbdd5 100644 --- a/data/patterns.txt +++ b/data/patterns.txt @@ -2,11 +2,14 @@ 1.0 1.0 2.0 2.0 1.5 1.0 +1.4 1.0 +2.0 1.0 +3.0 1.5 +3.5 2.0 +5.0 3.0 4.0 4.0 5.0 5.0 6.0 6.0 -3.0 1.5 -2.0 1.0 6.0 3.0 5.0 2.0 2.0 6.0 diff --git a/data/resources-6plus/symbols.sdf b/data/resources-6plus/symbols.sdf index 38a36c18cc..6ca6dfc5c6 100644 --- a/data/resources-6plus/symbols.sdf +++ b/data/resources-6plus/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -15,165 +15,165 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index 778e84fe75..2aa6e6b77e 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -7,272 +7,339 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi/symbols.sdf b/data/resources-hdpi/symbols.sdf index 5b2c2ec2ea..2fe16013c4 100644 --- a/data/resources-hdpi/symbols.sdf +++ b/data/resources-hdpi/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index f56e1cc613..d3926f1799 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -19,263 +19,279 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf index ac99e419b3..cdc32abacb 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -1,278 +1,345 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-ldpi_dark/symbols.sdf b/data/resources-ldpi_dark/symbols.sdf index d864725b67..bc21fcc12b 100644 --- a/data/resources-ldpi_dark/symbols.sdf +++ b/data/resources-ldpi_dark/symbols.sdf @@ -1,278 +1,345 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi/symbols.sdf b/data/resources-mdpi/symbols.sdf index 9457595bfc..88a765a6f6 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.sdf b/data/resources-mdpi_clear/symbols.sdf index 488f38292f..d2cd68ef7d 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -18,267 +18,283 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf index 843557c1c4..269c431506 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -18,264 +18,331 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf index 2494b55b54..8067a9200b 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -1,6 +1,6 @@ - + @@ -19,263 +19,330 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi/symbols.sdf b/data/resources-xxhdpi/symbols.sdf index 8cf97b1188..5ebed8f260 100644 --- a/data/resources-xxhdpi/symbols.sdf +++ b/data/resources-xxhdpi/symbols.sdf @@ -1,182 +1,182 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index fc1d144037..e4480521c6 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -1,284 +1,300 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf index 4554860d24..104d6463c7 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -19,263 +19,330 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drape/drape_common.pri b/drape/drape_common.pri index b3cde3c00f..f646c6064f 100644 --- a/drape/drape_common.pri +++ b/drape/drape_common.pri @@ -4,6 +4,8 @@ CMDRES = $$system(python ../tools/autobuild/shader_preprocessor.py $$SHADER_COMP INCLUDEPATH *= $$ROOT_DIR/3party/freetype/include SOURCES += \ + $$ROOT_DIR/3party/sdf_image/sdf_image.cpp \ + $$ROOT_DIR/3party/stb_image/stb_image.c \ $$DRAPE_DIR/attribute_buffer_mutator.cpp \ $$DRAPE_DIR/attribute_provider.cpp \ $$DRAPE_DIR/batcher.cpp \ @@ -31,7 +33,6 @@ SOURCES += \ $$DRAPE_DIR/overlay_tree.cpp \ $$DRAPE_DIR/pointers.cpp \ $$DRAPE_DIR/render_bucket.cpp \ - $$DRAPE_DIR/sdf_image.cpp \ $$DRAPE_DIR/shader.cpp \ $$DRAPE_DIR/shader_def.cpp \ $$DRAPE_DIR/stipple_pen_resource.cpp \ @@ -48,6 +49,8 @@ SOURCES += \ $$DRAPE_DIR/vertex_array_buffer.cpp \ HEADERS += \ + $$ROOT_DIR/3party/sdf_image/sdf_image.h \ + $$ROOT_DIR/3party/stb_image/stb_image.h \ $$DRAPE_DIR/attribute_buffer_mutator.hpp \ $$DRAPE_DIR/attribute_provider.hpp \ $$DRAPE_DIR/batcher.hpp \ @@ -85,7 +88,6 @@ HEADERS += \ $$DRAPE_DIR/overlay_tree.hpp \ $$DRAPE_DIR/pointers.hpp \ $$DRAPE_DIR/render_bucket.hpp \ - $$DRAPE_DIR/sdf_image.hpp \ $$DRAPE_DIR/shader.hpp \ $$DRAPE_DIR/shader_def.hpp \ $$DRAPE_DIR/stipple_pen_resource.hpp \ diff --git a/drape/glyph_manager.cpp b/drape/glyph_manager.cpp index 74f73fac7b..7aff244a0c 100644 --- a/drape/glyph_manager.cpp +++ b/drape/glyph_manager.cpp @@ -179,7 +179,7 @@ public: int imageHeight = bitmap.rows; if (bitmap.buffer != nullptr) { - SdfImage img(bitmap.rows, bitmap.pitch, bitmap.buffer, SDF_BORDER); + sdf_image::SdfImage img(bitmap.rows, bitmap.pitch, bitmap.buffer, SDF_BORDER); imageWidth = img.GetWidth() * scale; imageHeight = img.GetHeight() * scale; @@ -218,8 +218,8 @@ public: resultGlyph.m_metrics = glyph.m_metrics; resultGlyph.m_fontIndex = glyph.m_fontIndex; - SdfImage img(glyph.m_image.m_bitmapRows, glyph.m_image.m_bitmapPitch, - glyph.m_image.m_data->data(), SDF_BORDER); + sdf_image::SdfImage img(glyph.m_image.m_bitmapRows, glyph.m_image.m_bitmapPitch, + glyph.m_image.m_data->data(), SDF_BORDER); img.GenerateSDF(1.0f / (float)SDF_SCALE_FACTOR); diff --git a/drape_frontend/drape_frontend.pro b/drape_frontend/drape_frontend.pro index 46063144bf..f0e0740776 100755 --- a/drape_frontend/drape_frontend.pro +++ b/drape_frontend/drape_frontend.pro @@ -11,6 +11,7 @@ INCLUDEPATH *= $$ROOT_DIR/3party/freetype/include #DEFINES += DRAW_INFO SOURCES += \ + $$ROOT_DIR/3party/agg/agg_curves.cpp \ animation/base_interpolator.cpp \ animation/interpolation_holder.cpp \ animation/interpolations.cpp \ @@ -84,7 +85,6 @@ SOURCES += \ watch/glyph_cache_impl.cpp \ watch/geometry_processors.cpp \ watch/feature_processor.cpp \ - watch/agg_curves.cpp \ watch/default_font.cpp \ HEADERS += \ diff --git a/drape_frontend/watch/software_renderer.cpp b/drape_frontend/watch/software_renderer.cpp index 680c341b1b..1f1e4a6de3 100644 --- a/drape_frontend/watch/software_renderer.cpp +++ b/drape_frontend/watch/software_renderer.cpp @@ -5,7 +5,6 @@ #include "platform/platform.hpp" -#include "coding/lodepng_io.hpp" #include "coding/png_memory_encoder.hpp" #include "coding/parse_xml.hpp" @@ -14,6 +13,8 @@ #include "base/logging.hpp" +#include "3party/lodepng/lodepng_io.hpp" + #include "3party/agg/agg_rasterizer_scanline_aa.h" #include "3party/agg/agg_scanline_p.h" #include "3party/agg/agg_path_storage.h" diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index c6463f96e9..72c3595500 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -486,8 +486,6 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction) f.SetUserMarkActivationListener(bind(userMarkFn, self, userMarkSelector, _1)); m_predictor = [[LocationPredictor alloc] initWithObserver:self]; - m_StickyThreshold = 10; - self.forceRoutingStateChange = ForceRoutingStateChangeNone; self.userTouchesAction = UserTouchesActionNone; self.menuRestoreState = MWMBottomMenuStateInactive; diff --git a/iphone/Maps/Settings/SettingsViewController.mm b/iphone/Maps/Settings/SettingsViewController.mm index 88c28e0635..1ff5d9e01e 100644 --- a/iphone/Maps/Settings/SettingsViewController.mm +++ b/iphone/Maps/Settings/SettingsViewController.mm @@ -223,7 +223,7 @@ Settings::Units unitsForIndex(NSInteger index) withParameters:@{kStatValue : (units == Settings::Units::Metric ? kStatKilometers : kStatMiles)}]; Settings::Set("Units", units); [tableView reloadSections:[NSIndexSet indexSetWithIndex:SectionMetrics] withRowAnimation:UITableViewRowAnimationFade]; - [[MapsAppDelegate theApp].mapViewController setupMeasurementSystem]; + GetPlatform().SetupMeasurementSystem(); } else if (section == SectionRouting && indexPath.row == 1) { diff --git a/map/framework.cpp b/map/framework.cpp index 93dd82e3d3..b7e704f7f6 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -423,7 +423,7 @@ void Framework::UpdateLatestCountryFile(LocalCountryFile const & localFile) auto p = m_model.RegisterMap(localFile); MwmSet::MwmId const & id = p.first; if (id.IsAlive()) - InvalidateRect(handle.GetInfo()->m_limitRect); + InvalidateRect(id.GetInfo()->m_limitRect); m_searchEngine->ClearViewportsCache(); }